[automerger skipped] Merge "Adjust background restriction transition delays in tests" into main am: 99f1201b0f am: 2ba21d58c7 -s ours

am skip reason: Merged-In I4ab0cef2e81c465753a8aa2228d2e0ddf1abf1ea with SHA-1 adf00ec210 is already in history

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

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