Merge changes from topic "parse-authority-sc_dev" into sc-dev am: e5f20f07

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



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