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

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



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