Merge "ConnectivityService: improve wakelock logging" into oc-mr1-dev