DO NOT MERGE Give PBAP permission only after user confirms
am: e36ca3e96d

Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d