[automerger skipped] Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." am: 6dd6c5a6 am: 8b19886f am: 9c0a2e06 -s ours

am skip reason: skip tag Change-Id Iad46a1da9bc040baf4c438afbc5fd8cd128e99f1 with SHA-1 0aa606cc is already in history

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

Change-Id: Iba40ab1518a16d94e26d3e5115bff58224bb038c