Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev am: 86a118c060

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

Change-Id: I19519b91d29533ff459c14bca0038d6832db1da6