Merge "Modify DeviceConfigServiceTest to match actual DeviceConfig reset method behavior."