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

Change-Id: I8c736bf9993554753824c542ed7228e8e4541f3e