[automerger skipped] Merge "android:nativeHeapZeroInitialized test." am: 2d4f7fb27a am: 6fa90537d0 am: 5090413094 -s ours

am skip reason: skip tag Change-Id Icc191639fd3068ed4e96a4222b19520bdc147cfe with SHA-1 f7599f5bbe is already in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1661235

Change-Id: I1cd5fd647ce640d7d9474e29ae9217a2aaf9da20