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: I1cf75606ebf9ff7ad40eee5c8b1d38ccec160706