Merge "Add safety checks on KEY_INTENT mismatch." into tm-dev am: 3c8ae9c1...

Merge "Add safety checks on KEY_INTENT mismatch." into tm-dev am: 3c8ae9c1 am: 74fbba9b am: 104167c2

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



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