[automerger skipped] Merge "Remove zygote configuration for 32-bit primary,...

[automerger skipped] Merge "Remove zygote configuration for 32-bit primary, 64-bit secondary." am: cec2d69a am: b156c1af -s ours

am skip reason: Change-Id I67c59f1956cec7ea46ded6e0a772ac1226e2a7b3 with SHA-1 326f8e27 is in history

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

Change-Id: I64488423462066a0dfc9bf18fae9a575b0ee0a6a