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

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

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