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

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into udc-dev am: 13f57963 am: c9418f81 -s ours

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

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



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