[automerger skipped] Merge "Add getters to NetworkStateSnapshot" am: 2f83b6a7 am: 289a438f am: bbf4c3c2 -s ours am: fe69da2d -s ours

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

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

Change-Id: I806159e4a58e0da9f7e376749387768204054788