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

Change-Id: I6ee2f333c2d68c8542070f48ffac83d38e36d217