d1b11dc70f
All NetworkMonitor messages contain the netId of the source NetworkMonitor. But the netId is in various places in the message. It's most frequently in arg2, but sometimes it's boxed into an Integer in obj, and sometimes it's in another object. Always pass the netId into arg2. This allows us to write common code at the beginning of the function that extracts the netId and nai, and performs common actions on all messages. Bug: 216567577 Test: atest FrameworksNetTests FrameworksNetIntegrationTests Test: atest CtsNetTestCases:ConnectivityManageTest Test: atest CtsNetTestCases:NetworkAgentTest Change-Id: Idbbe3cddfc5475a2d56df387f840439dc4c9514c