Merge "Remove unused ConnectivityManager object" into main am: 0ae7fbc36c am: 7ca7a5925c

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

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