Merge "Keystore2: fix test_large_number_of_concurrent_db_manipulations"