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

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



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