Merge "Workaround prebuilt name conflict for service-connectivity" into tm-dev am: ca55de9512

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

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