[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 am: 7cc441bf2f  -s ours am: acfbc0eff4
am: 6197f671b2  -s ours

Change-Id: Ib3ccb0ba92d443b4cd85f4f93c24292bf3efaace