[automerger skipped] Merge changes from topic "le-audio-broadcast-old-api" am:...

[automerger skipped] Merge changes from topic "le-audio-broadcast-old-api" am: 71dd6119 -s ours am: 4ed2bcee -s ours

am skip reason: Merged-In Ic41c619411f1784bf586aa48ad0fa4a39a37ecb7 with SHA-1 7c1bf84c is already in history

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



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