Merge "Fix AudioDeviceInfo.TYPE_DOCK device mapping" into tm-qpr-dev