Merge "Update underlying networks if it is changed" am: 9d8001cea1 am: 2863db4ac3 am: ef372ecce9

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

Change-Id: I98ed5f628794742c86dcf9596247b74ca7beab07