Merge "[SettingsProvider] Add maxTargetSdk=S to ALWAYS_ON_VPN_LOCKDOWN_WHITELIST" into tm-dev