Merge changes from topic "mbr-component-name-sc-dev" into sc-qpr1-dev am:...

Merge changes from topic "mbr-component-name-sc-dev" into sc-qpr1-dev am: 88640ff3 am: 9c033a30 am: d5df787c

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



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