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

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

Change-Id: Ib1701358f9058aeaaa336be8d074cfaa700c4309