Merge "Turn off re-evaluate when the network resumes by default" into main am: 75d2ca8b88 am: 115038bf00 am: 0ceb3f919b

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

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