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

Change-Id: I6167bbc3c0cf1a725816dfb4b6ccfd0997fdc65c