[automerger skipped] Merge "Add list preference for BT audio device type...

[automerger skipped] Merge "Add list preference for BT audio device type selection" into udc-qpr-dev am: 3bf26493 am: dc5fd85f -s ours

am skip reason: Merged-In I797a92e1af4025596ef1c603ed4ab59813e3cbf0 with SHA-1 a1450822 is already in history

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



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