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

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into sc-v2-dev am: 26d2e7b6 am: 0bc50d59 am: d53d744a -s ours am: 4b29bb44 -s ours am: ec40de6e -s ours

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

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



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