Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev am: 3db0a14ab0
am: 9b44cc929f  -s ours

Change-Id: I92bbf99d5fcb12c5b755a80c51a03bee0238aaa1