Merge "Zip apex system server and standalone system server jars into...

Merge "Zip apex system server and standalone system server jars into system_server.zip." am: 4fbebb6d am: a8c84ad5 am: 016f2319

Original change: https://android-review.googlesource.com/c/platform/build/+/2287335



Change-Id: I7e4850a4fe745eb0c0af5a67ad88807cedc9fa9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>