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

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

Change-Id: Ibcf00c43b45ccb37e9dd0b9941cc7e1d6ba8985d