Merge "Bluetooth: Add support for PBAP UI preference"
am: 045d34ce76

Change-Id: I21f59d9a7df98f37009e730acaf63938304e3af2