Merge "Use libbase properties for a slight simplification." into main am: af11354ba5

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

Change-Id: Iadb9463a04c141216e77acbb2f0ebccba1bf8289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>