[automerger skipped] Merge changes Icc35293f,I05ed15cd into udc-qpr-dev am:...

[automerger skipped] Merge changes Icc35293f,I05ed15cd into udc-qpr-dev am: d9b21f6f am: 8d688870 -s ours

am skip reason: Merged-In Icc35293ff49e14dc3599fc12d153f70acd29042a with SHA-1 0daae6aa is already in history

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



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