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

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



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