Merge "Refactor BluetoothHeadset APIs used by Settings" am: b3de542cf7
am: 12558824e4

Change-Id: I70c293538b2b993800e8a77da8491237d21b0f9c