Merge "Fix testDhcpClientCaptivePortalApiEnabled flakes" am: fd4ed24e51 am: 27091efddf am: 451f1224e3

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

Change-Id: Iae6f3274cbd1aa39c85f9f400ad36cf349a49ed7