Merge changes from topic "mbr-broadcast-receiver-sc-dev" into sc-qpr1-dev am: 8a861351

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



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