Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

                // If we get this far, the callback or timeout will schedule the

                // If we get this far, the callback or timeout will schedule the

                // next restore state, so we're done

                // next restore state, so we're done

            } catch (Exception e) {

            } catch (Exception e) {

                Slog.e(TAG, "Unable to finalize restore of " + mCurrentPackage.packageName);

                final String packageName = mCurrentPackage.packageName;

                executeNextState(UnifiedRestoreState.FINAL);

                Slog.e(TAG, "Unable to finalize restore of " + packageName);

                EventLog.writeEvent(EventLogTags.RESTORE_AGENT_FAILURE,

                        packageName, e.toString());

                keyValueAgentErrorCleanup();

                executeNextState(UnifiedRestoreState.RUNNING_QUEUE);

            }

            }

        }

        }