Merge "Refactor BluetoothPbap APIs used by Settings"
am: a33dfe1e7b

Change-Id: Iace9178bd90072b3a2b1b938e0a46100da9ec058