[automerger skipped] Merge changes I32306fb8,Ic06c4535,I70c26232 into...

[automerger skipped] Merge changes I32306fb8,Ic06c4535,I70c26232 into udc-qpr-dev-plus-aosp am: 14279244 -s ours

am skip reason: Merged-In I32306fb8473c655e68d89d63a1e4f00c8bb5d61f with SHA-1 048aaf42 is already in history

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



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