[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
Change-Id: I19de0cbe315d298550edfb85039fbc87c42e6dc6