[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 am: 5db0449a -s ours am: eeae7390 -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: I728750d14231422b5301064fe38a08aec692cd51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>