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

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into sc-qpr1-dev am: a8f72935 -s ours am: 0e4f99ae -s ours am: ec521055 -s ours

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

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



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