[automerger skipped] Merge "[LeAudio] Add new string and an icon for the broadcast swtich dialog" am: 298223fad2 am: 2300e215c2 -s ours am: c2e87be61f -s ours am: ac29ef4068 -s ours
am skip reason: Merged-In Id8fbe22f3a23866a3c2d072664eda88c7f6d3004 with SHA-1 4a83839989 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2114793
Change-Id: I149096393350d35feeb72fa0dd9f442ebae833ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: