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

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-dev am: c162515b -s ours am: f6228ade -s ours

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

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



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