Merge changes from topic "am-612047d859854ab9aefcf7ca10023e1a" into...

Merge changes from topic "am-612047d859854ab9aefcf7ca10023e1a" into udc-qpr-dev-plus-aosp am: 4d1f5718 -s ours

am skip reason: Merged-In Ie72d5b5c538faa038a58033887716bdd870f35fa with SHA-1 c3dc5d58 is already in history

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



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