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

Change-Id: I721ccad75a466ed8ea6ac1cfe0ecbf6243d825f4