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

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

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