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: Ie921ba114f32513047c70594a9e0bfc5419e8279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>