[automerger skipped] Merge "Add support for only starting 64 bit zygote." into...

[automerger skipped] Merge "Add support for only starting 64 bit zygote." into tm-d1-dev am: 5fcd22ac -s ours am: a3afc991 -s ours am: ee4d169b -s ours

am skip reason: Merged-In Id37a223c73f9a61868b2e26450ef4b6964f7b496 with SHA-1 da94c7f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/19272483



Change-Id: Ib825a75af31ba4b08290ac1787754b528af83ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>