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

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

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