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

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

Change-Id: I07e4d69f44b939dc49b02f14e0db2863556a8467