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

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

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