[automerger skipped] Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev...

[automerger skipped] Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev am: b75d2f60 am: 6a23ee5d -s ours

am skip reason: Change-Id I4499a3639abab356e8faa6316bfa45541efd63ac with SHA-1 71a25ea6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12391062

Change-Id: Ib2a8e303776db54bf1bdd1742e978b9988802340