[automerger skipped] Merge "Add safety checks on KEY_INTENT mismatch." into...

[automerger skipped] Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2 am: 64e4cbc1 am: ac02d51e am: c3cde620 am: 926e1629 am: ce4b0d45 am: d46ebb94 -s ours

am skip reason: skipped by user haok

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



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