[automerger skipped] Merge "Migrate deleteOdex functionality to DexManager" am: 41207e284c am: 5383d7a776 am: 6c05b32085 -s ours
am skip reason: Change-Id I265f0c60be4f871d09c9513166723e31051ac1a3 with SHA-1 72e090b8df is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591851
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I362aad77519ade67f5e8b20a7cd918517957cbb4
This commit is contained in: