Merge "Evaluation delay = 8 secs for explicitly selected networks" am: 56d484c6e5

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

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