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

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

Change-Id: I635a619569fbe736d7d28ab156a0db2430a4ec3c