Merge "Update checkKeyIntent" into tm-dev am: 413da0f7 am: 183257bf am:...

Merge "Update checkKeyIntent" into tm-dev am: 413da0f7 am: 183257bf am: 6119d343 am: 205585a7

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>