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

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

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