Merge "[FUI15] Remove networkId in NetworkState" am: c8ae3c432b am: 6d8a6d5f70

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b833f1a9c95ad61190182e48a1b6e8ad3bf8807
tree: 1492d9de60f1ced7e1e6655968aeb75de326573f
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS