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

[automerger skipped] Check key intent for selectors and prohibited flags am: f7ba4ef2 -s ours am: d1e2d06c -s ours am: 9b2f1f26 -s ours am: a772442b -s ours am: 47eec46b -s ours am: c0aa4753 -s ours

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

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



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