Merge "Do not verify field count in tests used in CTS" am: 0ac9163620 am: 9a2a8e5205 am: 7e20473af3

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

Change-Id: Ia79dba5b479da80cd678762e98577536cc61b3cf