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

Change-Id: Ib7997a04d767635952c72c41096d6d500edf2c49