Merge changes from topic "am-720575d9a2f541f0a2aa3e7926da8055" into...

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