Merge "Re-enable RetailDemoModeServiceTest."

import com.android.server.retaildemo.RetailDemoModeService.Injector;

import org.junit.After;

import org.junit.AfterClass;

import org.junit.Before;

import org.junit.BeforeClass;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import java.util.concurrent.TimeUnit;

@RunWith(AndroidJUnit4.class)

@SmallTest

public class RetailDemoModeServiceTest {

    private static final int TEST_DEMO_USER = 111;

    private static final long SETUP_COMPLETE_TIMEOUT_MS = 2000; // 2 sec

    private RetailDemoModeService mService;

    private TestInjector mInjector;

    @BeforeClass

    @AfterClass

    public static void clearSettingsProvider() {

        FakeSettingsProvider.clearSettingsProvider();

    }

    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);