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

Merge changes from topic "am-d10ec22992044142aea04fd622cd5ff1" into udc-qpr-dev-plus-aosp am: f08f70d9 -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: Ic1d1a97d331ef0b977a39bd5b17706d9c9b3ef2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>