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

Change-Id: I16d491889a4877e6b5b9e602f29d35f83063cf61