Merge "Refactor DhcpErrorEvent error codes"
am: ed2e54a521

Change-Id: I5bbac5cedb73e1a7705914f190ff22f753791e96