[automerger skipped] Merge changes...

[automerger skipped] Merge changes I89aeecb8,I49cbbd17,I823efa1b,Ic2b99e7b,I1e91a5b3 into udc-qpr-dev am: 7cce89bb am: 2eaeb269 -s ours

am skip reason: Merged-In I89aeecb85c3c77f68da28758025ccf336269ca69 with SHA-1 2bbe034e is already in history

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



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