DO NOT MERGE - Merge ab/7272582 am: 5805ebf594

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/1736038

Change-Id: I59a375974a8ec73680fb4734ab68fbc42427c1b9