[automerger skipped] Merge "Add flag to deprecate STREAM_BLUETOOTH_SCO" into...

[automerger skipped] Merge "Add flag to deprecate STREAM_BLUETOOTH_SCO" into main am: 829d69d4 am: a3c016b5 -s ours

am skip reason: Merged-In Ia2133445bcaa094708039697f9033f3c7fd8393c with SHA-1 a16e713c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3341679



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