Improve staticlibs/Android.bp am: 8be10bfdff am: fd246323c1

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

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