Merge "Revert "Add more logging for wakelock stats inquiries""