PBAP: Fix to show authorization popup for FTP after PBAP

A case where PBAP connection was accepted before requesting
FTP connection from same remote device. So remote device was
authorized for all profiles & FTP connection is automatically
accepted. As PBAP have it's own authorization/trust mechanism
to store the user choice. So remote device should not be added
into NV trusted list(BD config file) while accepting PBAP/MAP
authorization request to solve this issue.

Conflicts:
	src/com/android/bluetooth/pbap/BluetoothPbapService.java

Change-Id: Icf781cfd93128058722d9f2ee1c070c3c8fe542d
CRs-Fixed: 568389