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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia47c896c17d61bc33db35ecb047746fddc006d35