Merge "Jarjar all classes in service-connectivity" am: 23c627b090 am: 793a4424d7

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

Change-Id: I7a55b08af6efb311af1c5385b63a450e9c343fd7