Merge "Fix flaky testNotifyNetwork_WithforceReevaluation test" am: 8a1327657a am: 2c43e2b450

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29d9014cd52a5565655eae5ebb6965eb8a1f62b2