Merge "installd: remove restored ce_data if de_data rollback failed" am: 580ae9ca0c am: 0f84c56b87
am: 7ef701f7eb

Change-Id: I62a978c72d0c29b914dd03721451d9100b16c619