[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 5805ebf594 am: 4140e30d8f am: e5f3e5d581 -s ours am: 797fb22104 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib54236644d315bad399cb5a56e4b7496e4a2aa2a