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

Change-Id: I239a1aa1ca4e8e374e99d7f4d4d25fb3bb6d1691