Refactor staticlibs am: 9b0df36ea4 am: 5e9db29008

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

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