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 am: cf9ba27c

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



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