Merge "Merge "Add tests for DhcpErrorEvent" am: 367c758601 am: faef1f66ed" into qt-dev-plus-aosp
am: 2a9ec5525d

Change-Id: I78d78dd421cc3ffea774ff5eaa6aa758debc9cf2