Merge "Simplify the Android CT properties" into main am: 54fdf07038 am: 4365366e2c

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

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