[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-dev am: c162515bd5 -s ours am: f6228ade76 -s ours am: 6b7c751554 -s ours
am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2f8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21614639
Change-Id: I772573dcf439c8893ab898bda6bcabca98ad6e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: