Merge "Update APF VTS to include the vendor API level check" into udc-dev am: 51d7c99586 am: 995f2b8ee5

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

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