Merge "Update checkKeyIntent" into sc-dev am: 6b3beba5ed am: 932c02d98b

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

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