Merge "Update APF VTS to include the vendor API level check" into udc-dev