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