Merge "Revert "Support restricted data connection when roaming""