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

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

Change-Id: I07771d833041fd5e040f247d561adda201eb5751