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 am: b6039f34 am: ab90ee56

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



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