Merge "Temporarily enable screen wakelock logging in WM" into oc-dev
am: ea6c7db229

Change-Id: I857eb959e7215798a14f7055325c18ca42b1f14b