Merge "Use consistent, correct terminology for vendor API levels in VTS tests." into main am: aa8ebc7c39 am: be4dd04964

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3412361

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