Merge "Netd unsolicited event porting" am: 98f0c30911
am: 6303689d0f

Change-Id: I79818efb3ebcc41b020c6442aa023cd9b46bda53