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

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

Change-Id: Ic0d9348652fe2d4b49092137af6b559d65721366