Merge "setWiredDeviceConnectionState requires MODIFY_AUDIO_ROUTING"