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

Change-Id: Iac4dc53ca9c5e3ebdd0b68590de729e7c76d919d