Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." am: e10545c736 am: 89ee361837

Change-Id: I3b32a91106646e98cf52b4ca48eeb4ebacd164db