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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ed42aae7377fe09399961ff40e03b83e5ce2f6f