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

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

Change-Id: I5f6639386c80befe9dc75811adce349aedddd53a