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