Merge "Log upstream network suspend/resume callbacks" am: 645cd2ad26 am: cc92587976
am: 47806bee11  -s ours

Change-Id: I457670ee375a85d19b7ce96991a2139a0ce725e3