Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." am: 6dd6c5a603 am: 8b19886f9b

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

Change-Id: Ie0cd5433f684c3b30690631e816f814b371db681