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