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

Merge "Update checkKeyIntent" into tm-dev am: 413da0f7 am: 183257bf am: 6119d343 am: 965fd40e am: 8b5e678e

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



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