Merge "android:nativeHeapZeroInitialized test." am: 2d4f7fb27a am: 6fa90537d0

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

Change-Id: Ide6ae3af8d6a2669b6a420570b7aea90ab3a21a0