Merge "Handling the light doze mode properly in ApfFilter" into main am: c4f0c01c3e am: 3227b5503b

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

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