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

* commit '3912524421f5258403de5c817f2dabab98f31494':

Change-Id: Ie8699a3a160f7148b1757b2ec8c5131e1701cd85