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

Change-Id: Ibfc816fcdf1400d72dc00f14096d58c92e129485