Merge changes from topic "netd-event-listener-aidl" am: 481251a0c2 am: 379029671a
am: 94cffb3a6c

Change-Id: I2b30cac46eb96e3a0425088f516176ce5ac4fd28