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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cd580cfd9c08b474cdc985e6ddc7d4273e4aa69