Merge "Keystore 2.0 SPI: Fix contract between equals and hashCode" am: efc036801c am: f3da868dad am: 13f995456c

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

Change-Id: I6a8958fac5106ebf6b42f9f881da6d6f48ee66f3