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

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

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