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

Change-Id: I0b3783fbbe9c69d625e9ecc38a26e375b6e06787