Merge "ConnectivityService: improve wakelock logging"
am: d8f298365a

Change-Id: I85f8b34008416c920f85e1e5d923dd324dd89e5e