Merge "Add a SettingsProvider key for Adaptive connectivity" into rvc-qpr-dev am: b0df580193

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

Change-Id: I7421c1f07d89d1b7c5371c83ed8a94f7f4ae9c71