Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am: 13059cc2ad

Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5