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

Change-Id: I952c5db6a279173ae91d8791f0cd8111210dd662