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

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

Change-Id: I2a76878d7994a936fd8bbff8fde9e2cdbb5287ee