Merge "Null cursors don't need to be wrapped."

            }

            final Cursor cursor = mContentProvider.query(mPackageName, url, projection, selection,

                    selectionArgs, sortOrder, remoteCancellationSignal);

            if (cursor == null) {

                return null;

            }

            if ("com.google.android.gms".equals(mPackageName)) {

                // They're casting to a concrete subclass, sigh

                return cursor;