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

Change-Id: I1890ae9f3b34e09926b624aec22c6ceef496b243