Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev