Merge "ConnectivityService: log wakelock activity in dumps"