[automerger skipped] Merge "NetdEventListenerService extends...

[automerger skipped] Merge "NetdEventListenerService extends BaseNetdEventListener" into tm-mainline-prod am: 4d130ea3 -s ours am: a5d7ea4c -s ours

am skip reason: Merged-In Ifed011441624cc9075111819effd93cdb3e33239 with SHA-1 7adf98be is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21416758



Change-Id: I98e5cf18aecefa499047dff8ee500c7fdd8a5c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>