[automerger skipped] Keystore 2.0 SPI: Fix contract between equals and...

[automerger skipped] Keystore 2.0 SPI: Fix contract between equals and hashCode am: 3a37085e -s ours am: 0bd32bf3 -s ours

am skip reason: Merged-In I3f7e6d72d53c7051c13daeb5aa6ce1abf4eb0cc5 with SHA-1 7bdc12d5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306878

Change-Id: I3701687d2f7e187451fc8744d435503cb1db5116