[automerger skipped] Merge changes from topic "V-udc-dev-plus-aosp" into...

[automerger skipped] Merge changes from topic "V-udc-dev-plus-aosp" into udc-dev-plus-aosp am: 48857bdb am: f4e89b48 -s ours

am skip reason: Merged-In Ia8bd807ab25260ff6716e2aea36e4d3e8567eb22 with SHA-1 9ada3545 is already in history

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



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