Merge "[automerger skipped] Merge "Add tests for DhcpErrorEvent" into qt-dev...
Merge "[automerger skipped] Merge "Add tests for DhcpErrorEvent" into qt-dev am: fa2e9939 -s ours am skip reason: change_id I9b65a2eef94567d2b79a9955619938e64906080d with SHA1 09ad5e25 is in history" into qt-dev-plus-aosp