Merge "AudioDeviceInfo: add analog audio dock type"