Merge changes from topic "parse-authority-sc-v2-dev" into sc-v2-dev am: a7e93180 am: 6ffe9179

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



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