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

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



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