diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 5bbbcc295fd03..4480b41ed73a2 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -1886,7 +1886,7 @@ public abstract class ContentResolver {
                 ContentProvider.getUriWithoutUserId(uri),
                 notifyForDescendants,
                 observer,
-                ContentProvider.getUserIdFromUri(uri, mContext.getUserId()));
+                ContentProvider.getUserIdFromUri(uri, UserHandle.myUserId()));
     }
 
     /** @hide - designated user version */
@@ -1956,7 +1956,7 @@ public abstract class ContentResolver {
                 ContentProvider.getUriWithoutUserId(uri),
                 observer,
                 syncToNetwork,
-                ContentProvider.getUserIdFromUri(uri, mContext.getUserId()));
+                ContentProvider.getUserIdFromUri(uri, UserHandle.myUserId()));
     }
 
     /**
@@ -1982,7 +1982,7 @@ public abstract class ContentResolver {
                 ContentProvider.getUriWithoutUserId(uri),
                 observer,
                 flags,
-                ContentProvider.getUserIdFromUri(uri, mContext.getUserId()));
+                ContentProvider.getUserIdFromUri(uri, UserHandle.myUserId()));
     }
 
     /**
diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml
index 7b8c22962bccd..91ce7a468484e 100644
--- a/core/tests/coretests/AndroidManifest.xml
+++ b/core/tests/coretests/AndroidManifest.xml
@@ -1357,9 +1357,6 @@
             </intent-filter>
         </service>
 
-        <service android:name="android.content.CrossUserContentService"
-                android:exported="true" />
-
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/core/tests/coretests/src/android/app/activity/LocalProvider.java b/core/tests/coretests/src/android/app/activity/LocalProvider.java
index b7a63cec7d6f9..d6a10c2061b94 100644
--- a/core/tests/coretests/src/android/app/activity/LocalProvider.java
+++ b/core/tests/coretests/src/android/app/activity/LocalProvider.java
@@ -29,19 +29,6 @@ import android.util.Log;
 public class LocalProvider extends ContentProvider {
     private static final String TAG = "LocalProvider";
 
-    private static final String AUTHORITY = "com.android.frameworks.coretests.LocalProvider";
-    private static final String TABLE_DATA_NAME = "data";
-    public static final Uri TABLE_DATA_URI =
-            Uri.parse("content://" + AUTHORITY + "/" + TABLE_DATA_NAME);
-
-    public static final String COLUMN_TEXT_NAME = "text";
-    public static final String COLUMN_INTEGER_NAME = "integer";
-
-    public static final String TEXT1 = "first data";
-    public static final String TEXT2 = "second data";
-    public static final int INTEGER1 = 100;
-    public static final int INTEGER2 = 101;
-
     private SQLiteOpenHelper mOpenHelper;
 
     private static final int DATA = 1;
@@ -64,20 +51,13 @@ public class LocalProvider extends ContentProvider {
 
         @Override
         public void onCreate(SQLiteDatabase db) {
-            db.execSQL("CREATE TABLE " + TABLE_DATA_NAME + " (" +
+            db.execSQL("CREATE TABLE data (" +
                        "_id INTEGER PRIMARY KEY," +
-                       COLUMN_TEXT_NAME + " TEXT, " +
-                       COLUMN_INTEGER_NAME + " INTEGER);");
+                       "text TEXT, " +
+                       "integer INTEGER);");
 
             // insert alarms
-            db.execSQL(getInsertCommand(TEXT1, INTEGER1));
-            db.execSQL(getInsertCommand(TEXT2, INTEGER2));
-        }
-
-        private String getInsertCommand(String textValue, int integerValue) {
-            return "INSERT INTO " + TABLE_DATA_NAME
-                    + " (" + COLUMN_TEXT_NAME + ", " + COLUMN_INTEGER_NAME + ") "
-                    + "VALUES ('" + textValue + "', " + integerValue + ");";
+            db.execSQL("INSERT INTO data (text, integer) VALUES ('first data', 100);");
         }
 
         @Override
@@ -94,10 +74,6 @@ public class LocalProvider extends ContentProvider {
     public LocalProvider() {
     }
 
-    static public Uri getTableDataUriForRow(int rowId) {
-        return Uri.parse("content://" + AUTHORITY + "/" + TABLE_DATA_NAME + "/" + rowId);
-    }
-
     @Override
     public boolean onCreate() {
         mOpenHelper = new DatabaseHelper(getContext());
diff --git a/core/tests/coretests/src/android/content/CrossUserContentResolverTest.java b/core/tests/coretests/src/android/content/CrossUserContentResolverTest.java
deleted file mode 100644
index 027ba8ebf06a2..0000000000000
--- a/core/tests/coretests/src/android/content/CrossUserContentResolverTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content;
-
-
-import static org.junit.Assert.fail;
-
-import android.app.ActivityManager;
-import android.app.activity.LocalProvider;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.UserInfo;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.IBinder;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-@MediumTest
-@RunWith(AndroidJUnit4.class)
-public class CrossUserContentResolverTest {
-    private final static int TIMEOUT_SERVICE_CONNECTION_SEC = 4;
-    private final static int TIMEOUT_CONTENT_CHANGE_SEC = 4;
-
-    private Context mContext;
-    private UserManager mUm;
-    private int mSecondaryUserId = -1;
-    private CrossUserContentServiceConnection mServiceConnection;
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getContext();
-        mUm = UserManager.get(mContext);
-        final UserInfo userInfo = mUm.createUser("Test user", 0);
-        mSecondaryUserId = userInfo.id;
-        final PackageManager pm = mContext.getPackageManager();
-        pm.installExistingPackageAsUser(mContext.getPackageName(), mSecondaryUserId);
-        ActivityManager.getService().startUserInBackground(mSecondaryUserId);
-
-        final CountDownLatch connectionLatch = new CountDownLatch(1);
-        mServiceConnection = new CrossUserContentServiceConnection(connectionLatch);
-        mContext.bindServiceAsUser(
-                new Intent(mContext, CrossUserContentService.class),
-                mServiceConnection,
-                Context.BIND_AUTO_CREATE,
-                UserHandle.of(mSecondaryUserId));
-        if (!connectionLatch.await(TIMEOUT_SERVICE_CONNECTION_SEC, TimeUnit.SECONDS)) {
-            fail("Timed out waiting for service connection to establish");
-        }
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (mSecondaryUserId != -1) {
-            mUm.removeUser(mSecondaryUserId);
-        }
-        if (mServiceConnection != null) {
-            mContext.unbindService(mServiceConnection);
-        }
-    }
-
-    /**
-     * Register an observer for an URI in the secondary user and verify that it receives
-     * onChange callback when data at the URI changes.
-     */
-    @Test
-    public void testRegisterContentObserver() throws Exception {
-        Context secondaryUserContext = null;
-        String packageName = null;
-        try {
-            packageName = InstrumentationRegistry.getContext().getPackageName();
-            secondaryUserContext =
-                    InstrumentationRegistry.getContext().createPackageContextAsUser(
-                            packageName, 0 /* flags */, UserHandle.of(mSecondaryUserId));
-        } catch (NameNotFoundException e) {
-            fail("Couldn't find package " + packageName + " in u" + mSecondaryUserId);
-        }
-
-        final CountDownLatch updateLatch = new CountDownLatch(1);
-        final Uri uriToUpdate = LocalProvider.getTableDataUriForRow(2);
-        final TestContentObserver observer = new TestContentObserver(updateLatch,
-                uriToUpdate, mSecondaryUserId);
-        secondaryUserContext.getContentResolver().registerContentObserver(
-                LocalProvider.TABLE_DATA_URI, true, observer, mSecondaryUserId);
-        mServiceConnection.getService().updateContent(uriToUpdate, "New Text", 42);
-        if (!updateLatch.await(TIMEOUT_CONTENT_CHANGE_SEC, TimeUnit.SECONDS)) {
-            fail("Timed out waiting for the content change callback");
-        }
-    }
-
-    /**
-     * Register an observer for an URI in the current user and verify that secondary user can
-     * notify changes for this URI.
-     */
-    @Test
-    public void testNotifyChange() throws Exception {
-        final CountDownLatch notifyLatch = new CountDownLatch(1);
-        final Uri notifyUri = LocalProvider.TABLE_DATA_URI;
-        final TestContentObserver observer = new TestContentObserver(notifyLatch,
-                notifyUri, UserHandle.myUserId());
-        mContext.getContentResolver().registerContentObserver(notifyUri, true, observer);
-        mServiceConnection.getService().notifyForUriAsUser(notifyUri, UserHandle.myUserId());
-        if (!notifyLatch.await(TIMEOUT_CONTENT_CHANGE_SEC, TimeUnit.SECONDS)) {
-            fail("Timed out waiting for the notify callback");
-        }
-    }
-
-    private static final class CrossUserContentServiceConnection implements ServiceConnection {
-        private ICrossUserContentService mService;
-        private final CountDownLatch mLatch;
-
-        public CrossUserContentServiceConnection(CountDownLatch latch) {
-            mLatch = latch;
-        }
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mService = ICrossUserContentService.Stub.asInterface(service);
-            mLatch.countDown();
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-        }
-
-        public ICrossUserContentService getService() {
-            return mService;
-        }
-    }
-
-    private static final class TestContentObserver extends ContentObserver {
-        private final CountDownLatch mLatch;
-        private final Uri mExpectedUri;
-        private final int mExpectedUserId;
-
-        public TestContentObserver(CountDownLatch latch, Uri exptectedUri, int expectedUserId) {
-            super(null);
-            mLatch = latch;
-            mExpectedUri = exptectedUri;
-            mExpectedUserId = expectedUserId;
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri, int userId) {
-            if (mExpectedUri.equals(uri) && mExpectedUserId == userId) {
-                mLatch.countDown();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/tests/coretests/src/android/content/CrossUserContentService.java b/core/tests/coretests/src/android/content/CrossUserContentService.java
deleted file mode 100644
index 9cbe549ba1128..0000000000000
--- a/core/tests/coretests/src/android/content/CrossUserContentService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package android.content;
-
-import android.app.Service;
-import android.app.activity.LocalProvider;
-import android.net.Uri;
-import android.os.IBinder;
-
-public class CrossUserContentService extends Service {
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mLocalService.asBinder();
-    }
-
-    private ICrossUserContentService mLocalService = new ICrossUserContentService.Stub() {
-        @Override
-        public void updateContent(Uri uri, String key, int value) {
-            final ContentValues values = new ContentValues();
-            values.put(LocalProvider.COLUMN_TEXT_NAME, key);
-            values.put(LocalProvider.COLUMN_INTEGER_NAME, value);
-            getContentResolver().update(uri, values, null, null);
-        }
-
-        @Override
-        public void notifyForUriAsUser(Uri uri, int userId) {
-            getContentResolver().notifyChange(uri, null, false, userId);
-        }
-    };
-}
\ No newline at end of file
diff --git a/core/tests/coretests/src/android/content/ICrossUserContentService.aidl b/core/tests/coretests/src/android/content/ICrossUserContentService.aidl
deleted file mode 100644
index 2c5cde44a6276..0000000000000
--- a/core/tests/coretests/src/android/content/ICrossUserContentService.aidl
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package android.content;
-
-import android.net.Uri;
-
-interface ICrossUserContentService {
-    void updateContent(in Uri uri, String key, int value);
-    void notifyForUriAsUser(in Uri uri, int userId);
-}
\ No newline at end of file