Merge "Fix AudioAttributes.setContentType"