Merge "Fix ConnectivityManager memory leak" am: 8e3b96b61f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2076481

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