Merge "Replace ConnectivityManager hidden symbols on SettingsLib"