Merge "Rollback to DHCPDISCOVER w/o Rapid Commit if handshake doesn't succeeds." am: 835efd629d am: a3d0383983

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

Change-Id: I98b956ed324ad85bdbf9abb12e012d57fd3feaad