Merge "Remove libbase_headers from libservice-connectivity" am: 54957450bc am: 4b1ed0f183

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

Change-Id: I934bb590a31f757ba4bd671e11a22f58fe5d0e0d