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

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

Change-Id: I56faa65ab4e5900d30affca0475819a26d999c68