Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 am: ac02d51ea3 am: c3cde6206d am: 926e1629cb am: 6edc8b7cda am: c5ed605d04 am: a3f9e446c1 am: 9f246a16a7 am: b83a318d27 am: 30f1a024db

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

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