[automerger skipped] Merge "Change NNAPI VTS to use TEST_P to iterate across all service instances" am: b287873b73 am: a89b02a5cd am: c63d12cf35
am: 61eeeca5f5 -s ours
am skip reason: change_id I1e301d7c9f9342bb8f35a267bef180f510944b19 with SHA1 7076f629b7 is in history

Change-Id: I1ffbda3f8e2738aaecc829ee79931030fa4e1f03