Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383 am: 8d8d85b93e am: 6ccd3310db am: 2fc30b6e6e
am: cc437bf66f

Change-Id: I8f0a725630b9f79d3c91245b91fd630b2668dd58