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

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

Change-Id: I0a8b880722ea0d81ebb635ac919fd87662eab974