Merge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev
am: d8c77c94ff

Change-Id: Icc60544a98e6a0357207d45600c8f943efc0d169