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

Merge changes from topic "parse-authority-sc_dev" into sc-dev am: e5f20f07 am: 36b892d7 am: 36ba84d1 am: 21695227 am: d6072c02 am: 1dab5d7c am: ada75b72

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



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