[automerger skipped] Merge "Do not verify field count in tests used in CTS" into sc-dev am: e1c01ccee6 -s ours am: 493f00d8fe -s ours

am skip reason: Merged-In Ib1701358f9058aeaaa336be8d074cfaa700c4309 with SHA-1 9a2a8e5205 is already in history

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

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