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

Change-Id: I9877ba7613b9a41cb2b48df2ab0ac49be460961d