[automerger skipped] Merge "Cleanup of Zygote files" am: 6fca4110dc am: c91fb923a6 am: f7678be6bf -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I445d87d35c15324bf63eb955f92783cfcd750d71