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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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