Merge "bluetooth: Fix Mono/Stereo selection with new codec list" into main am:...

Merge "bluetooth: Fix Mono/Stereo selection with new codec list" into main am: c640aeee am: 51cac72d

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



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