Merge "Resolve BluetoothA2dpSink APIs used by Settings" am: f14e2e1e am: 03942aba am: 51e9a965 Change-Id: I01bf2455e5817347eb6652678ab81535c8a45c44