Merge "Build mainline tests with static libc++ and version script" into main am: bc4544f18c

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

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