Merge "Fix CtsNNAPIBenchmarkTestCases fail due to timeout" am: 2ccb1e7abd am: 71019bdfef am: f331bbba8c am: e587b377fd

Original change: https://android-review.googlesource.com/c/platform/cts/+/1328135

Change-Id: I0c291c93e306d8241dff3585805e6e040eda6d00