[automerger skipped] Merge "Add VtsHalNeuralnetworksTargetTest to NNAPI test mapping" am: 5ae082aad5 am: 8138ebc7c0 am: 1165b395c4 am: 8507998040 -s ours

am skip reason: Change-Id Ia59446246bef2a41912a6b0c9d11abd125e8d913 with SHA-1 3665d245ad is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic98154a938472b9ef3b4cc51d4bff26d90a609b9