Merge "Delay test for APF activation after screen-off" into main am: c45f7675df

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

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