Merge "[SettingsProvider] fix server-side Readable maxTargetSdk check" into sc-v2-dev am: 325943b358

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

Change-Id: I8e3209163040285157f08ae67f6357e784877922