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

Merge changes from topic "am-ed5d77f7685c443197cbca230cef63e8" into udc-qpr-dev-plus-aosp am: 3edd4bb9

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



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