Merge "Use PTS flag to set 48_1/2/3/4 audio configuration for broadcast PTS...

Merge "Use PTS flag to set 48_1/2/3/4 audio configuration for broadcast PTS test" am: 239a273d am: bc999781

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



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