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

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

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