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

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

Change-Id: I17f3ca8aeaa66e2bcc6a1b0613e76230faea2a9a