Merge "Keystore CTS: Test replacement of existing secret key is a no-op." into sc-v2-dev