[automerger skipped] Merge "Bug fix compiling secondary dexes from cmd line"...

[automerger skipped] Merge "Bug fix compiling secondary dexes from cmd line" am: 9cd68de1 am: 6e933d81 am: 63e490a7 -s ours am: 6dc9c57f -s ours

am skip reason: Merged-In Ic3cef72627985bb906e87b875c180a7dc32a295f with SHA-1 f9484453 is already in history

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

Change-Id: I2c6d7995d59de2b6eaab99a24ca48d464fc02b25