Merge "Build service-connectivity with system_server API" am: c006592307

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

Change-Id: Ib7b959b42034be815210250a3c36de5343faf3c8