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

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

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