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

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



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