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

Change-Id: If09053be31d9c2315f12f18c52715028e8767592