[automerger skipped] Merge "Check key intent for selectors and prohibited...

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev am: 7b2b2630 -s ours am: 5eb26bd5 -s ours am: 3e7ab1d8 -s ours am: 38c7b8c9 -s ours am: ef080cb4 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



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