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

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

Change-Id: I2db219e6e6e9f2ba6c685cb2462da66bcbe5f91f