[automerger skipped] Merge "Build service-connectivity with system_server API" am: c006592307 am: acff4165a4 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722748
Change-Id: I44e69b32ff44c8698d2213010cdcab854af9a288
This commit is contained in: