[automerger skipped] Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev am: b75d2f6009 am: 6a23ee5d37 -s ours
am skip reason: Change-Id I4499a3639abab356e8faa6316bfa45541efd63ac with SHA-1 71a25ea64f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12391062
Change-Id: Ib2a8e303776db54bf1bdd1742e978b9988802340
This commit is contained in: