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

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



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