[automerger skipped] Merge "Cleanup of Zygote files" am: 6fca4110 am:...

[automerger skipped] Merge "Cleanup of Zygote files" am: 6fca4110 am: c91fb923 am: f7678be6 -s ours am: 9b8d3698 -s ours

am skip reason: Change-Id I6ba33cfcb4729a75dbbd4f908f4b46110d3bb991 with SHA-1 94b45280 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice4232b899924bc22f5aada326802c6048ca22ad