Merge "[BugFix]Fix enter deep doze when moving" am: 525d252ec1
am: bc68555ae5

Change-Id: I348161b6f650ceb2c26d29279179d408b5020c7f