[automerger skipped] Merge "Move ro.zygote to vendor" am: 0de3a8b9 am:...

[automerger skipped] Merge "Move ro.zygote to vendor" am: 0de3a8b9 am: b972aca9 -s ours am: bca21e1b -s ours

am skip reason: Change-Id I86919f993ae44f3502eb63e728d33acaa14f7088 with SHA-1 9faf469d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ebc36566c01f5d199de496b10feaeb99696d0e3