Merge "Do not verify field count in tests used in CTS" am: 0ac9163620 am: 43feb8f624

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

Change-Id: If3ed60209dbad1e3309ac2a6d513c11208410484