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: I45f9c17fe23e9d5835de124439a5a1e9e48c1fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>