Merge changes from topic "network_event_count_query" into main am: 61987aa9a0

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

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