Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev am: ab10e1a7db
am: 8d3efa6722

Change-Id: I1d3420380691efd886315275598134b98f4041ed