[automerger skipped] Merge "Migrate deleteOdex functionality to DexManager"...

[automerger skipped] Merge "Migrate deleteOdex functionality to DexManager" am: 41207e28 am: 5383d7a7 am: 6c05b320 -s ours am: 6eddd02c -s ours

am skip reason: Change-Id I265f0c60be4f871d09c9513166723e31051ac1a3 with SHA-1 72e090b8 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68624f9bd8d6f24ab3ed35cc0b0c8d139bbe071a