Merge "Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a58 am: 4093fdef" into rvc-d1-dev-plus-aosp am: fb52f6ce

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

Change-Id: Ibeaf0c58af38090cd5f5c87691e8501323cdaed9