Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed4883 am: 8d8d85b9 am: 6ccd3310 am: 2fc30b6e am: cc437bf6 Change-Id: I8f0a725630b9f79d3c91245b91fd630b2668dd58