Merge changes from topic "am-516f971ef8c843efb2173f44d33d3071" into...

Merge changes from topic "am-516f971ef8c843efb2173f44d33d3071" into udc-qpr-dev-plus-aosp am: fd4dfde5 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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