[automerger skipped] Merge "Add NNAPI loop timeout VTS test" am: 2225653ff1 am: fbcf4ca055 -s ours
am skip reason: Change-Id I642772d3c00c12d72380598d9d86743706179d72 with SHA-1 cc873aee8f is in history

Change-Id: I01930ec9e93cd791167a948ee930df5b76718918