[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 -s ours am: 327393c6 -s ours
am skip reason: Change-Id I03c4161a01861b47cf878945f7f5cc77c821cd57 with SHA-1 904eb826 is in history
Change-Id: I080a5832b491b6fd116ce92b71e543f1c69aa177