Merge "Make system_server.zip compatible with prebuilt apex builds" into main am: b9511617

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



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