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

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

Change-Id: I73a208178340711db24d978fa98431d69b06535c