Merge "Increase NNAPI VTS single-test timeout to 20m." am: e551cc102e am: aab6678cb4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1380711

Change-Id: I3ea2766b17de82073ab2811e3c7b3ea08fbd0347