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

Change-Id: I96b3a2f59ff77d646c641043428db673eaaf2653