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

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

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