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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1b11f8a93f421dcd1b251602ae560edba9b74e3