[automerger skipped] Merge "Bug fix compiling secondary dexes from cmd line" am: 9cd68de124 am: 6e933d8124 am: 63e490a759 -s ours

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

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

Change-Id: Ic28852ad4451fd1b078d91506867771c3dd2b420