Merge "Ensure all NetworkMonitor messages store the netId in arg2." am: e7eb8b156f

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

Change-Id: Icd7949d762055313419f8bdad1bcd39a9e2f8736