[automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efc am:...

[automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efc am: d131bdfb -s ours am: 397b8e19 -s ours

am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2113244



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