Merge changes from topic "networkmonitor_ddr" into main am: 97a3d53c52

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

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