Merge "Remove unused import in ConnectivityManager" am: db6fc1afe8
am: fe098f8207

Change-Id: I64a2a607769d7194161e7728465c38cabbfa9345