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

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



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