Merge "Update checkKeyIntent" into tm-dev am: 413da0f7ed am: 183257bfa9

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

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