Merge "Revert "Update checkKeyIntent"" into sc-dev am: 2c0bd83b8a am: fa98e6522d

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

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