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

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

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