Merge "Fix CoreSettingsObserverTest."

import static com.google.common.truth.Truth.assertWithMessage;

import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;

import android.content.Context;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.Handler;

import android.provider.Settings;

        mContentResolver = new MockContentResolver(mContext);

        mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());

        when(mContext.getContentResolver()).thenReturn(mContentResolver);

        when(mContext.getResources()).thenReturn(mock(Resources.class));

        mAms = new ActivityManagerService(new TestInjector(mContext),

                mServiceThreadRule.getThread());