Merge "Updating KeyStore2Test to track change in behavior of KeyStoreSpi.engineSetEntry"