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

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into tm-qpr-dev am: ec7c9ce1 -s ours am: 83fcadea -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/+/21614348



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