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

Change-Id: Ifbb103349e9f44d976008d00ad332dbbf43fef96