Merge "[pm] Bug fix compiling secondary dexes from cmd line" into tm-dev am:...

Merge "[pm] Bug fix compiling secondary dexes from cmd line" into tm-dev am: 1b9cc5b2 am: 4e7b340c

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

Change-Id: I7306e9fc00c65d783241105ce3cc9dd6c0e76241