Merge "Add the fixed test case back into presubmit" am: 3763316aeb am: 89763b0ba3

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

Change-Id: Ia3044257db56333b8ce2e2819dea41f21329ab0a