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

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

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