Merge "Change NNAPI VTS TEST_MAPPING to restrict testing on sample drivers"
am: 3d3c792bb8

Change-Id: Iea55a1b00cb2b56ea7ec3045d47cad0e5398405e