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