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

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

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