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