Merge "Fix testDhcpClientCaptivePortalApiEnabled flakes" am: fd4ed24e51

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

Change-Id: Iae6f135a3ad7fe93df6b240120ac55cbc0d40d97