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

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



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