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

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

Change-Id: I950fa97da1413689e95f43ee005e87bda8ec9fff