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

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

Change-Id: I783c0fa0b831017c85c05e56f3c8773c660e5485