Merge "Give PBAP permission only after user confirms" into pi-dev am: fcac34d723
am: cd09ff50bb

Change-Id: I404d323a39dc7a42f20c3411aebb2237c1fb13f3