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

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

Change-Id: Ia2a214276fd3e97dcd40987c44e54576bfac1933