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

Change-Id: I60e8229bcd64882321115295f0f49a8618a2a5f1