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

Change-Id: I9121798bba0be9dcdf1e45d39c092020620fa53b