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

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into tm-dev am: 091bcbd5 -s ours am: 17a442b6 -s ours

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

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



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