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