Merge "Do not route audio to speaker if Bluetooth audio is connected" into nyc-mr1-dev