Merge "[Settings] Code refactor" into rvc-dev

import static org.mockito.Matchers.anyObject;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import com.android.settings.testutils.shadow.ShadowDisclaimerItemFactory;

import com.android.settings.testutils.shadow.ShadowFragment;

import java.util.ArrayList;

import java.util.List;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Captor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;

import java.util.ArrayList;

import java.util.List;

@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowDisclaimerItemFactory.class, ShadowFragment.class})