Merge "Add safety checks on KEY_INTENT mismatch." into tm-dev am: 3c8ae9c1de am: dda1043288 am: e6d8d70c55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20104719 Change-Id: I3ad9b4cc493c317652d335a61e35c399f6491912 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: