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

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



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