[automerger skipped] Merge changes I4ea75eeb,Ifbbd7eee into udc-qpr-dev am:...

[automerger skipped] Merge changes I4ea75eeb,Ifbbd7eee into udc-qpr-dev am: 67152567 am: badc4bd6 -s ours

am skip reason: Merged-In I4ea75eeb65aec91da2b6ccb76a35a5915dbcac64 with SHA-1 0d1ae2d3 is already in history

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



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