[automerger skipped] Merge "Adjust the timeout parameters in DHCP client."...

[automerger skipped] Merge "Adjust the timeout parameters in DHCP client." into rvc-dev am: 43fc3e16 -s ours am: 4f3f8ec4 -s ours am: f95d9128 -s ours am: 00300871 -s ours

am skip reason: Change-Id Ie162b0d59da0082cd0c5ec02bb391c3d27f40607 with SHA-1 46028eec is in history

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

Change-Id: Ibe5679612353edd305896e4c7f0d8a1ca8b9fea5