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 am: 926e1629 am: 6edc8b7c am: c5ed605d am: 49a30f55 am: f5adbb98

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



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