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

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

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



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