[automerger skipped] Merge "NNAPI VTS update in response to utility function change" am: 7261ba7d10 am: 3bc25b4e5d am: 54cd38d4dc
am: 46a8b7948d -s ours
am skip reason: change_id I56c3b04e6fec11d526e2a1ff5b896f31cb12eb5f with SHA1 5756887a7b is in history

Change-Id: Ib656c35ab0bb9b1bc5363101ce050730511b37d1