Merge changes from topic "parse-authority-udc_dev" into udc-dev am: 4307b622

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



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