Merge "Add safety checks on KEY_INTENT mismatch." into tm-dev am: 3c8ae9c1 am: dda10432

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20104719



Change-Id: If58c270e3bf58f8e269292aa8790958058f13f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>