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

Change-Id: Ifb7664c7ade59390d682d0bebb6055097e653342