Merge "Stop using BaseNetdEventListener in ConnectivityService." am: 883c34a45d am: 90c612a9b1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14f7ce15ba13a96ed070370fe75b73010352a415