Merge "PBAP Client SDP record"
am: d94d3e2ca4

Change-Id: I0280f0ba03bc77348438021c62470184eca5d74e