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

Change-Id: I8a41c084d20cea9d07d1a704fba3ea08b613d758