[automerger skipped] Merge "Refactor Bluetooth Codec settings to dynamic ListPreference" into main am: b83471f770 am: 47177e048f -s ours

am skip reason: Merged-In Iedbfd01c0d1b59df8a073f4e9aedca3913e6d45f with SHA-1 89612e53d7 is already in history

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

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