Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095
am: bdf90a2d1c

* commit 'bdf90a2d1c357cb6ebfa0101b06821553d7cd120':

Change-Id: I257fa1af4faea0833cc6f723aedd2185a6629898