Merge "NetdEventListenerService extends BaseNetdEventListener" into tm-mainline-prod