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

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

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