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

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

Change-Id: I7cfd7074243b74c18fe75833ae5f5d4fdce0e2f6