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