Merge "Apply a recovery logic for apps on data"

                    // Note: this code block is executed with the Installer lock

                    // already held, since it's invoked as a side-effect of

                    // executeBatchLI()

                    if ((e != null) && pkg.isSystem()) {

                    if (e != null) {

                        logCriticalInfo(Log.ERROR, "Failed to create app data for " + packageName

                                + ", but trying to recover: " + e);

                        destroyAppDataLeafLIF(pkg, userId, flags);