Merge changes from topic "am-903efd95b2b5467e9877afcc7aa198be" into...

Merge changes from topic "am-903efd95b2b5467e9877afcc7aa198be" into udc-qpr-dev-plus-aosp am: 434c96f4 -s ours

am skip reason: Merged-In Ib4eef40a0f59512c669b069532e55d36293f9e1c with SHA-1 5545b1cc is already in history

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



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