[automerger skipped] Merge "Do not verify field count in tests used in CTS" into sc-dev am: e1c01ccee6 am: b80ebef192 am: 97274fbe3d -s ours am: a0221d42a2 -s ours am: 412b2c19d7 -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: Ibe504e8e8ec0e604bc45aa53fa1fbd2937ecf53d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>