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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b833f1a9c95ad61190182e48a1b6e8ad3bf8807