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

Change-Id: I5ae43875d527fbbff3ed34c07e0dc3f75a2fe609