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

Change-Id: I9c3f6d5eedcb1197908c8a2cf208215a458cd25d