Merge "Remove the OffloadServiceInfo from jarjar exclusion" into main am: 6795186c00

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817244

Change-Id: I5d2b5e27e04055aa2f16f56805037331038cb9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>