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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57c03c39a069e0ad9760ab5b411caf69a9fdcf45
tree: 3a8be6f0da1138efda380283094cf1a02202f170
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS