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

Change-Id: I0dc8b6f5cb73ac5dd8e1eaeff46f079e12b7db90