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