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

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

Change-Id: Ie127f5ed35a50952eab0b5049fdd6259c04124e2