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

Change-Id: I93c0eb7c8add966378647400e11e33765d952345