[automerger skipped] Merge "Shorten the timeout of DHCP INIT-REBOOT state."...

[automerger skipped] Merge "Shorten the timeout of DHCP INIT-REBOOT state." into rvc-dev am: d431edc1 -s ours am: a5209a88 -s ours am: 621ff7d4 -s ours

am skip reason: Change-Id I9d214e193a4f80a9512a3a6f385ca3554f050386 with SHA-1 859a591a is in history

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

Change-Id: I0efd9a5a484d191a083de565635324be602177c0