Merge "Resolve BluetoothA2dp hidden APIs to resolve dependencies"