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

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

Change-Id: I7790eefe75237e695a644365ef146ecde00d7577