Merge "keystore2_test: Enable stress test"