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

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

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