fix ARM initial-setup handling for extra choice
    
    As with the text install test, there's an additional choice on
    the 'Time settings' path compared to whatever image garret
    developed the test on; right after 'Time settings' you have to
    pick 'Set timezone' or 'Configure NTP servers'. So adjust the
    test to handle this, just like we did there.