am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev

            final String original = setCallingPackage(callingPkg);

            try {

                ContentProviderResult[] results = ContentProvider.this.applyBatch(operations);

                if (results != null) {

                    for (int i = 0; i < results.length ; i++) {

                        if (userIds[i] != UserHandle.USER_CURRENT) {

                            // Adding the userId to the uri.

                            results[i] = new ContentProviderResult(results[i], userIds[i]);

                        }

                    }

                }

                return results;

            } finally {

                setCallingPackage(original);