[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: 7f7b9d01 -s ours am: 8b9e0427 -s ours am: e730a2ea -s ours am: 3458a3a8 -s ours am: 038122cd -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: I2a22b80a231da419395ee20e88ffb615dde348f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>