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