Merge "Fix testDhcpClientCaptivePortalApiEnabled flakes" am: fd4ed24e am: 27091efd am: 451f1224 am: 9c6c06ba

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

Change-Id: If4d16fe7c7a0543599638ec7c393d9ec063b69bf