Merge "Reevaluate when underlying network changes" am: 00477a12a6 am: 29b103959c am: 1205006ca2 am: 40c736510c

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

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