Merge "Replace ConnectivityManager hidden symbols on Settings"