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

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

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



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