[automerger skipped] Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." am: 113ea83450 am: fbacb0ed11 am: ae75006891 -s ours
am skip reason: Change-Id Iab29da790c0f5faae68227770bc3a84bbc94f124 with SHA-1 a75e26be99 is in history

Change-Id: Id9bb3a105949c34234f9f8f5ae1043e5d70613a5