[automerger skipped] Merge "Add safety checks on KEY_INTENT mismatch." into...

[automerger skipped] Merge "Add safety checks on KEY_INTENT mismatch." into tm-dev am: 3c8ae9c1 am: cce93910 -s ours

am skip reason: skipped by user haok

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



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