[automerger skipped] Merge "aggregate the items of network selection list"...

[automerger skipped] Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae am: d99bead0 -s ours

am skip reason: Merged-In I8e05b9f6784bad7f0de4e79cc6e707749745f0c1 with SHA-1 2868b4af is already in history

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

Change-Id: I6aef2553076eb06af37c57176dbf354b2a7ad577