Merge "Add missing ServiceType values to IntDef."