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

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

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