Merge "[MS55.2] Move NetworkStateSnapshot into module folder" am: a8ae24410d am: 973990adf5

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

Change-Id: I4f49f19c1eb39e1708eb9e3584707a45dd82835b