Merge "dexopt: Restore old files when cancelled" am: 4b7d885899 am: 9329cc6a12 am: f82cdbd24b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1892847

Change-Id: Ie185ac981df4adb9a8d65adf1fa912f92645ebc5