Merge changes from topic "b/269460851"

* changes:
  keystore2: Fix timeout handling
  keystore2_test: Join all test threads