[automerger skipped] Merge "Add getters to NetworkStateSnapshot" am: 5db5248f5c am: 2ed08ec159 am: 07bad70c23 -s ours

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

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

Change-Id: Ice81dc86428db24ce535ad052e5b594e18d401b8
tree: 728e4613dd37ca988412fece30a5ea54c4b259b1
  1. core/
  2. services/