Merge "Remove py2 usages" am: 8d6944cc91

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

Change-Id: I36531320785a0443c44aa1dd541002871775f396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>