Merge android11-tests-dev. am: 75b3f163f8 am: 3ac8554a08 am: 4c382f1e3b

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

Change-Id: If83ebe01c304f6ee514407425622767598fe18b0