[automerger skipped] NetdEventListenerService extends BaseNetdEventListener...

[automerger skipped] NetdEventListenerService extends BaseNetdEventListener am: 9857c9b6 -s ours am: f993dd8a -s ours am: 1717120f -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: Ia71111ec5068707ac933527e04947d9bcf3d1f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>