Merge "Update checkKeyIntent" into tm-dev am: 413da0f7ed am: 005a489115

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

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