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

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

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