Merge "[SettingsProvider] Add maxTargetSdk=S to ALWAYS_ON_VPN_LOCKDOWN_WHITELIST" into tm-dev am: 64b875e1 am: 454aaa44 am: 74536c50

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



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