Merge "Refactor BluetoothPbap APIs used by Settings"