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

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into sc-dev am: b013c0e9 -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/+/21614620



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