Merge "Define DhcpErrorEvent constants at compile time" am: 5803191975
am: a0b2076f75

Change-Id: Iada7c4e80233ea451b88bba2cf81bdfad225fe09