Merge \\"Treat everyone the same.\\" into nyc-mr1-dev am: a1b026ea2e

am: f32a5c426f

Change-Id: I5e3c1c5fc2b25fd7a5b8cd61ed9fb073b66240e2

core/java/android/content/ContentProviderClient.java

@@ -147,13 +147,7 @@ public class ContentProviderClient implements AutoCloseable {
             if (cursor == null) {
                 return null;
             }
-
-            if ("com.google.android.gms".equals(mPackageName)) {
-                // They're casting to a concrete subclass, sigh
-                return cursor;
-            } else {
-                return new CursorWrapperInner(cursor);
-            }
+            return new CursorWrapperInner(cursor);
         } catch (DeadObjectException e) {
             if (!mStable) {
                 mContentResolver.unstableProviderDied(mContentProvider);