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

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

Change-Id: I6feee381fcd271ebb089aa00d56cfe677d9f8ca6