[automerger skipped] Merge "Add getters to NetworkStateSnapshot" am: 1c9a1c1353 am: 18e5c6bd73 am: 168985a811 -s ours

am skip reason: Merged-In Id1707753b42ae88d2b95e4bd00a792609434e4f5 with SHA-1 c8081e954e is already in history

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

Change-Id: Ice81dc86428db24ce535ad052e5b594e18d401b8