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

Change-Id: Iabe99993001e069b8a8077533bca1fa7fb2f59ba