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

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

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