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

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

Change-Id: I0538aba4fc88588e4275f0e4a00ad41c5a6fcfe0