Merge "Handling the light doze mode properly in ApfFilter" into main am: c4f0c01c3e am: 94a3b7e163

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

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