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

Change-Id: I375e47a21d2fc6a5e67ff6367087c22beceb6377