Merge "Update APF VTS to include the vendor API level check" into udc-dev am: 51d7c99586 am: 1a96bfb9e1 am: cdb5da2896 am: c72cb83a2a

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

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