Merge "Log upstream network suspend/resume callbacks" am: 645cd2ad26
am: cc92587976

Change-Id: I6e2fe9d6e9a030eaee8ed359b630f2a81a833ae3