Merge "Revert "Re-enable test that was causing TimeoutExceptions on ARM64.""
am: 971c69db91

* commit '971c69db916d66096dccd481df621cee7147d20c':
  Revert "Re-enable test that was causing TimeoutExceptions on ARM64."