[automerger skipped] Merge "Enable DHCP INIT-REBOOT state on R." into rvc-dev...

[automerger skipped] Merge "Enable DHCP INIT-REBOOT state on R." into rvc-dev am: 7b486419 am: 32cab450 -s ours am: d4e79360 -s ours

am skip reason: Change-Id I62d1ab6b94be1ee95fbaa2ecce62eaba01e7892d with SHA-1 5b129a63 is in history

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

Change-Id: Ieaf8bce1a28aceca34d1f055fe10d627a3fc4d9a