[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev am: 7b2b263042 -s ours am: 5eb26bd57d -s ours am: 3e7ab1d818 -s ours am: 38c7b8c93f -s ours am: ef080cb4d2 -s ours am: 81a6574c81 -s ours am: 20b42f7be4 -s ours am: d1c3fcaedb -s ours
am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68bda is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21614524
Change-Id: Ia75f05cf9fd3c5fab8e0c32adebb9017567c7c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: