Merge "Add a NetworkAgent API to indicate that a network will be replaced." am: 9f6e6c4e27

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987457

Change-Id: Ic0993febcabeb115aa6728bfd3b74a17bdebf110