Merge "Remove libbase_headers from libservice-connectivity" am: 54957450bc am: 990d19bef2 am: f62ea02c0a

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

Change-Id: I92419ca67525f3e6495489c2b455e934bc18f24a