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

Change-Id: I46ce27d67ff21341079cf3e449d531a7041d97a6