Merge "Update APF VTS to include the vendor API level check" into udc-dev am: 51d7c99586 am: 43e19e7a90 am: 5097b7b674 am: 83245103c9

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

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