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

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

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