Merge "installd: remove restored ce_data if de_data rollback failed"
am: 580ae9ca0c

Change-Id: Ibfdb902495de3470e916828572b8712c6b4e016f