[automerger skipped] Merge "Revert "Update checkKeyIntent"" into sc-dev am:...

[automerger skipped] Merge "Revert "Update checkKeyIntent"" into sc-dev am: 2c0bd83b am: fa98e652 am: 59b194f6 -s ours am: baa972f2 -s ours am: 906373e9 -s ours am: 2e31bb7b -s ours am: c6b82ef2 -s ours

am skip reason: Merged-In Ied7961c73299681aa5b523cf3f00fd905893116f with SHA-1 d04cea5e is already in history. Merged-In was found from reverted change.

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



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