[automerger skipped] Merge "Increase NNAPI VTS single-test timeout to 20m." into android11-tests-dev am: b2bee2be31 -s ours

am skip reason: Merged-In I869208c79ff4c1d1928603a5630f456915928957 with SHA-1 670532f318 is already in history

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

Change-Id: Iadd4e7e0947f8f6be5631395939f4114b1475c87