Merge "Add VtsHalNeuralnetworksTargetTest to NNAPI test mapping" am: 5ae082aad5

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1612122

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c6076cb3a40db45f26e7ac6a9371509b2a1ea31