[automerger skipped] Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev am: 86a118c060 -s ours

am skip reason: Merged-In Ie7f637248302f3e6b61be69ef4c6a7a906e69275 with SHA-1 4f0546ccbe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108489

Change-Id: If270a8bb58cb47feca8e8d01b43b12c1ecfe3e24