Merge changes from topic "am-9961523b69a7401c91623837da78bed3" into...

Merge changes from topic "am-9961523b69a7401c91623837da78bed3" into udc-qpr-dev-plus-aosp am: 2873f012 -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/+/24301483



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