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