[automerger skipped] Merge "Freeze netd_event_listener interface." into qt-dev...
[automerger skipped] Merge "Freeze netd_event_listener interface." into qt-dev am: 39a34d46 -s ours
am: a7c79c9b -s ours
am skip reason: change_id I1613c2102665bfb7b80391d8dee304b86bf797e8 with SHA1 ac0924d1 is in history
Change-Id: I1c7ca955917a1a3c55ffaf0d7366a342569bb2c4