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: 29c6a750

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



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