Merge "Change NNAPI VTS to use TEST_P to iterate across all service instances"