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: I393bb26734298e73bfcd0a4265168baad9257c14