Keystore 2.0 SPI: Fix contract between equals and hashCode 2 am: e36fe6bf46

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

Change-Id: I72f5719d480cd0f68bac07261b298543e94aeb45