Merge "Log upstream network suspend/resume callbacks" am: 645cd2ad am: cc925879 am: 47806bee -s ours am: acebdce2 -s ours Change-Id: If09053be31d9c2315f12f18c52715028e8767592