Merge "Increase NNAPI VTS single-test timeout to 20m." am: eafa06164d am: 1523e7711b am: ab4c0acd8f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I511d553e4af82a38353c3e7076a0ae8a037ee10a