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

Change-Id: If5635251a46e56aa3fde429f80c4bab6c790ed84