Merge "Merge "Add a "Use high quality audio" option to Bluetooth A2DP device...
Merge "Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev am: c695e448" into oc-dev-plus-aosp
am: 5da64d33
Change-Id: I685dd7cc62810fbe2fa277ca40869e5e4d0566a2