[automerger skipped] Check key intent for selectors and prohibited flags am: 64f6c1e1 -s ours am: 0c332c3b -s ours am: 820983f7 -s ours am: 7d607446 -s ours am: a3ddfe35 -s ours am: c470da8f -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 1ef76e11 is already in history

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



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