Merge "Add VtsHalNeuralnetworksTargetTest to NNAPI test mapping"