Merge "Check key intent for selectors and prohibited flags" into udc-dev am: 13f57963

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



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