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 am: 0a5140b7

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



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