[automerger skipped] Merge "Update checkKeyIntent" into sc-dev am: 6b3beba5...

[automerger skipped] Merge "Update checkKeyIntent" into sc-dev am: 6b3beba5 am: 932c02d9 am: 2ffd6484 -s ours am: 5fe0aa3b -s ours

am skip reason: Merged-In Ied7961c73299681aa5b523cf3f00fd905893116f with SHA-1 d04cea5e is already in history

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



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