Merge changes from topic "am-48bc57803eb44e17af444316568a00ef" into...

Merge changes from topic "am-48bc57803eb44e17af444316568a00ef" into udc-qpr-dev-plus-aosp am: 013a3a06 -s ours

am skip reason: Merged-In I62e829555c43136080ee4909f7dcf8c388165e9f with SHA-1 bcf680d0 is already in history

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



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