Merge "Resolve BluetoothA2dp hidden APIs to resolve dependencies" am: 67eae9d7ba
am: 5ae6e7adc1

Change-Id: Ibdf41e956337808e63130db9e6101efa0382a4f1