[automerger skipped] ro.zygote in base_system.mk is optional am: b00931e7...

[automerger skipped] ro.zygote in base_system.mk is optional am: b00931e7 am: d1b411bc am: a00c194d -s ours

am skip reason: Change-Id Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4 with SHA-1 b1261aac is in history

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

Change-Id: I6134477d14d3a49077e0a9083ecd0d7fc4d9a4b0