Merge "[FUI15] Remove networkId in NetworkState" am: 3237216211 am: f5fbe10aa7 am: eb70fc6721

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57c03c39a069e0ad9760ab5b411caf69a9fdcf45