Merge "Don't delete new dalvik-cache for otapreopt" am: 7cd8f20c96 am: a5c10d68fb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id10768200ade51a2dc62f2792caaee9ea30f408b