Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." am: 113ea83450

Change-Id: I39b74228c6c2a48ace7ad36dba995fa6f91bfbb5