Merge changes from topic "am-50519702e1ae439d97810e87f18c8cb6" into...

Merge changes from topic "am-50519702e1ae439d97810e87f18c8cb6" into udc-qpr-dev-plus-aosp am: 0f106c35 -s ours

am skip reason: Merged-In I720699093d5c5a584283e5b76851938f449ffa21 with SHA-1 b38e1e5a is already in history

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



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