[automerger skipped] Merge "[MS55.2] Move NetworkStateSnapshot into module folder" am: a8ae24410d -s ours am: 44179d38f7 -s ours

am skip reason: Merged-In Ide7431d0c98aebd389bee86d13ff44f5ef8b8283 with SHA-1 d6a6a4ebf3 is already in history

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

Change-Id: Ib08ca0a437fab2c8dee7e0ff5c88cbcd13e0a958