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

Change-Id: Iccf433dd506f42ae07531fe9cd0fa239882d4cf2