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

Change-Id: I4214a86442f10e2157cf16194ec10850cae282a7