Merge "Switch the zygote over to mallopt(M_BIONIC_SET_HEAP_TAGGING_LEVEL)." am: 2ccc6dfb02 am: 4a7fecb695

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552757

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedbdbaeae764866d927349c6fe256f4369aadfff