Merge changes from topic "am-e25d7396226c447296ddfe8972c5c62f" into...

Merge changes from topic "am-e25d7396226c447296ddfe8972c5c62f" into udc-qpr-dev-plus-aosp am: 66a83c42 -s ours

am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 1c3d701c is already in history

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



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