[automerger skipped] Merge "[SettingsProvider] fix server-side Readable...

[automerger skipped] Merge "[SettingsProvider] fix server-side Readable maxTargetSdk check" into sc-v2-dev am: 325943b3 am: c5638277 -s ours

am skip reason: Merged-In Ia3e4541564d9928ff04fa95564bb9e043d49e8ee with SHA-1 85034c77 is already in history

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

Change-Id: I6293183279a639dda3e0201553e0d791ca503fbb