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

Change-Id: I613bc1f2974d9fd192bba0c14964b4dc51391eee