Merge "Update checkKeyIntent" into tm-dev am: 413da0f7ed am: 005a489115 am: 632acd545e am: 1564a2fc89 am: 28394c6c51

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

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