Merge "Merge "Resolve BluetoothA2dp hidden APIs to resolve dependencies" am: 67eae9d7 am: 5ae6e7ad am: b0ff23dd"