Merge "Update checkKeyIntent" into tm-dev am: 413da0f7 am: 005a4891 am:...

Merge "Update checkKeyIntent" into tm-dev am: 413da0f7 am: 005a4891 am: 632acd54 am: 1564a2fc

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



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