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

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



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