Merge changes from topic "am-94172948375e4750a9157f3313bb26ed" into...

Merge changes from topic "am-94172948375e4750a9157f3313bb26ed" into udc-qpr-dev-plus-aosp am: 309e3361 -s ours

am skip reason: Merged-In I6e70e238b3a5ace1cab41ec5796a6bb4d79769f2 with SHA-1 48223d60 is already in history

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



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