Merge "Minimize amount of time blocking inbound shortcut binder call during I/O" into main

    private void saveShortcutPackageItem(TypedXmlSerializer out, ShortcutPackageItem spi,

            boolean forBackup) throws IOException, XmlPullParserException {

        spi.waitForBitmapSaves();

        if (forBackup) {

            if (spi.getPackageUserId() != spi.getOwnerUserId()) {

                return; // Don't save cross-user information.

            }

            spi.waitForBitmapSaves();

            spi.saveToXml(out, forBackup);

        } else {

            spi.saveShortcutPackageItem();

            spi.scheduleSave();

        }

    }