Merge "[SettingsProvider] Add maxTargetSdk=S to ALWAYS_ON_VPN_LOCKDOWN_WHITELIST" into tm-dev am: 64b875e1 am: 66b67c6b am: 77f41139

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730032



Change-Id: I209d194207f112f29af76c705e03385cf93d5ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>