Merge "PBAP Pairing Permission" into nyc-dev