Merge "Keystore 2.0 SPI: Fix contract between equals and hashCode"