Merge "Separate the experimental DHCP features setting in IpClientIntegrationTest." am: 3d03021c8c

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

Change-Id: I09308d76400bb65a3a80131312d4d87f671bf12f