Merge "Remove py2 usages" am: 8d6944cc91 am: 134298598a am: 9476091089

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

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