Merge changes from topic "V-udc-dev-plus-aosp" into udc-dev-plus-aosp am: 48857bdb

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



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