Merge "Resolve BluetoothA2dpSink APIs used by Settings"
am: f14e2e1e1a

Change-Id: I32965067fa88d53c87c06df959f6079216bf00aa