Merge "Remove unused import in ConnectivityManager"
am: db6fc1afe8

Change-Id: I1a7ce964c66e0204bfcc69948f7bed23ab498c81