Merge "Reevaluate when underlying network changes" am: 00477a12a6 am: ce9a37f326 am: 0942dfcb56

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

Change-Id: Id82e4f80ea8edf2ca5561f7069183fce9471b4c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>