Merge "Re-enable test that was causing TimeoutExceptions on ARM64."
am: dddb767f59

* commit 'dddb767f59bd67bb9c3d4c38916f64a71f060e40':
  Re-enable test that was causing TimeoutExceptions on ARM64.