Merge "PBAP: Update intent parameters for connection." am: 75b7ef2a0b
am: 59160d0b7a

Change-Id: Ib35387ac4bdabe7a14d8aa9e68a86199c74bb6c1