tree 2857b24cf7bb2bdeeb18274362d3bd3d9ec92924
parent d066d5b7fcb097ce4106ec262bc05c60eef03941
parent 6ccd3310db8c9278a0dfeb46e75c457d7e0878f3
author zhuguangqing <zhuguangqing@xiaomi.com> 1566352840 -0700
committer android-build-merger <android-build-merger@google.com> 1566352840 -0700

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

Change-Id: Iba10dc657081b184f14e21f8a2a0e86fb9146faa