Merge "Do not verify field count in tests used in CTS" into sc-dev am: e1c01ccee6 am: b80ebef192

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

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