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