[automerger skipped] Merge "Revert "Update checkKeyIntent"" into sc-dev am: 2c0bd83b8a am: fa98e6522d am: 59b194f6e7 -s ours am: baa972f2bc -s ours am: 2c98139201 -s ours

am skip reason: Merged-In Ied7961c73299681aa5b523cf3f00fd905893116f with SHA-1 d04cea5ea0 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: If1109a759db3ead7d09d82f885655a6dd2989685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>