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