[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d
am: 48aa959b14
am: 7cc441bf2f
-s ours
am: acfbc0eff4
Change-Id: If3486b74a7b37cf12637aabeeece719c9567093a
This commit is contained in: