Merge "Revert "system_suspend: add more logging for wakelock stats inquiries""