Merge "Add NNAPI loop timeout VTS test" am: 2225653ff1 am: fbcf4ca055

Change-Id: I6458fc68faf71043332a9020ee95063a0c09dbe6