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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc9c98ad6b6215deb03da3df57113c5b53d5f018