Merge "Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095 am: bdf90a2d1c" into nyc-mr1-dev-plus-aosp
am: e7aa11c898

* commit 'e7aa11c8989a2b56d74edba7d460aadde849233d':

Change-Id: Id2864a6f79690f80134c6b6065f41983a6886093