[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 am: 4e5fe665 -s ours am: dde8a372 -s ours am: 4c2cc2c7 -s ours

am skip reason: Change-Id Ie162b0d59da0082cd0c5ec02bb391c3d27f40607 with SHA-1 98b0ff75 is in history

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

Change-Id: Ie3b142a09d8777817881fcefbed8069a9eda4d2b