Merge "Drop system_server dexopt in ZygoteInit" am: 5e1c9fe7fc am: b55a7938a6

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

Change-Id: I4101218b669feb79235c469013693752c9bca8f8