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

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

Change-Id: Iacbc1d367d88a8bfde44853efecbe3e996d894d5