Merge "To fix the title and switch button of the broadcast dialog" into...

Merge "To fix the title and switch button of the broadcast dialog" into tm-qpr-dev am: 747b4c2b am: 68b61ad5 am: 716456e6

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



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