Merge "Convert handler creation on the main thread." into ub-contactsdialer-g-dev

# Needed for tests

-keep class com.android.contacts.common.compat.CompatUtils { *; }

-keep class com.android.contacts.common.Collapser { *; }

-keep class com.android.contacts.common.ContactPhotoManager { *; }

-keep class com.android.contacts.common.ContactsUtils { *; }

-keep class com.android.contacts.common.database.NoNullCursorAsyncQueryHandler { *; }

-keep class com.android.contacts.common.format.FormatUtils { *; }

-keep class com.android.contacts.common.model.ValuesDelta { *; }

-keep class com.android.contacts.common.MoreContactUtils { *; }

-keep class com.android.contacts.common.preference.ContactsPreferences { *; }

-keep class com.android.contacts.common.test.mocks.MockContactPhotoManager { *; }

-keep class com.android.contacts.common.testing.InjectedServices { *; }

-keep class com.android.contacts.common.util.BitmapUtil { *; }

-keep class com.android.contacts.common.util.ContactDisplayUtils { *; }

import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Resources;

import android.support.test.InstrumentationRegistry;

import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.SmallTest;

        Mockito.when(mSharedPreferences.contains(ContactsPreferences.DISPLAY_ORDER_KEY))

                .thenReturn(true);

        InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {

            @Override

            public void run() {

                mContactsPreferences = new ContactsPreferences(mContext);

            }

        });

    }

    public void testGetSortOrderDefault() {

        Mockito.when(mResources.getBoolean(Mockito.anyInt())).thenReturn(