[automerger skipped] Merge "Add a SettingsProvider key for Adaptive...

[automerger skipped] Merge "Add a SettingsProvider key for Adaptive connectivity" into rvc-qpr-dev am: b0df5801 am: 8940f104 -s ours

am skip reason: Change-Id I719e44a29a54ee886e5d3a7180fd3ad9a7dff599 with SHA-1 d562b1bf is in history

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

Change-Id: Id449dbc3b353d53eae2114aff99ea1069a5790a1