Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2...

Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2 am: 64e4cbc1 am: ac02d51e am: c3cde620

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



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