Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." into sc-dev