[automerger skipped] DO NOT MERGE Give PBAP permission only after user...
[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e9 am: 48aa959b am: 7cc441bf -s ours am: acfbc0ef
am: 6197f671 -s ours
Change-Id: Ib3ccb0ba92d443b4cd85f4f93c24292bf3efaace