Merge "Revert^2 "Use vendor api level instead of sdk version"" into main am: 8a4a11f913 am: a4fae95782

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

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