[automerger skipped] Check key intent for selectors and prohibited flags am:...

[automerger skipped] Check key intent for selectors and prohibited flags am: 92114886 -s ours am: de18b4c0 -s ours am: e6178d53 -s ours am: 8415146a -s ours

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

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



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