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

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

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