[automerger skipped] Merge "Fix the potential double transition in...

[automerger skipped] Merge "Fix the potential double transition in DhcpState#enter" into rvc-dev am: 2e16ff33 am: df1fcffe am: 3ec9ebb8 -s ours

am skip reason: Change-Id I03c4161a01861b47cf878945f7f5cc77c821cd57 with SHA-1 904eb826 is in history

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

Change-Id: I18411f655a84a4aae2d5f1b79bf5ca38358f4f33