[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: 75f48cb7 -s ours

am skip reason: Merged-In I6ba33cfcb4729a75dbbd4f908f4b46110d3bb991 with SHA-1 94b45280 is already in history

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

Change-Id: If1614a9e8373fba160c62d31ef4f98eae048af69