Merge "AOD: Ensure WakeLock is held for delayed dozeTimeTick" into pi-dev
am: 4fca6d6b31

Change-Id: I6664456dd641d9e1abb2fe9d65841fadb2299f37