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

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

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