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

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

Change-Id: If535cd7f85fc0821f45d6c8bd0b5f38ef83cf737