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