Merge "Include structs lib in service-connectivity-pre-jarjar" into main am:...

Merge "Include structs lib in service-connectivity-pre-jarjar" into main am: db67a804 am: e5a99273

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



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