Merge "Remove the OffloadServiceInfo from jarjar exclusion" into main