Merge "Fix flaky test testRestrictedProfileAffectsVpnUidRanges"