Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" am: ddf3660af8

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

Change-Id: I426c10c8fd9a17c94423c8e0ddf9811a5cf2cd40