[automerger skipped] Merge "Use PTS flag to set 48_1/2/3/4 audio configuration...

[automerger skipped] Merge "Use PTS flag to set 48_1/2/3/4 audio configuration for broadcast PTS test" into tm-qpr-dev am: df802ded -s ours am: ca20d191 -s ours

am skip reason: Merged-In I83b97e47df6af9444f6a7ff8de6979e8a1ee882c with SHA-1 a4d3aef8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19237990



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