[automerger skipped] Merge "[MS55.1] Move NetworkStateSnapshot into module folder" into sc-mainline-prod am: 40f56430 -s ours

am skip reason: Merged-In Ib8bb4d67a1774fdb1594c61aed2ce112ce94972e with SHA-1 d9101cda is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16825709

Change-Id: I512c9cbe67c951028f6b121cf52bf52894018c31