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: 48d56bd5 am: c162ad5d

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



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