Merge "Add ability to stage multiple apexs." am: 7bd2a5e4fd am: 20d93a701c

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

Change-Id: I8fbd4352b3575a9f95ed3e560bd615ba3f981552