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

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

Change-Id: I9b1a8c4c0fd7e1917b4dd2b0e394a1532675cd11