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

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

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