Merge "Shedule task with current run if there is a service in the cache" into main am: 435ca438bb

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

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