Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
am: c695e44866

Change-Id: I26f967140184851eb61ddd8def352133995f3637