[automerger skipped] Merge "developer settings: remove unused a2dp Preference"...

[automerger skipped] Merge "developer settings: remove unused a2dp Preference" into main am: b896665a am: 096a2fb9 -s ours

am skip reason: Merged-In Ibd526fffddf5ea545afc437a5daee12bb1cf8746 with SHA-1 6b7a5073 is already in history

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



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