Merge "Replace ConnectivityManager hidden symbols on Settings" into sc-dev