Merge changes from topic "am-4dc5aff1bd8e4f008380867b43b40ead" into...

Merge changes from topic "am-4dc5aff1bd8e4f008380867b43b40ead" into udc-d1-dev-plus-aosp am: 6e5754e5 -s ours

am skip reason: Merged-In I738c07fb9a3a804b4864e246ac986460ee1d0568 with SHA-1 ddab6137 is already in history

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



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