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

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

Change-Id: I6ca041a5ba5b6d085a9f795019ce9e03c8660d37