Merge "Check key intent for selectors and prohibited flags" into sc-v2-dev am:...

Merge "Check key intent for selectors and prohibited flags" into sc-v2-dev am: 26d2e7b6 am: 0bc50d59 am: 30cc3b9a

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



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