Merge "Make pending intents of uninstall failure immutable"