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

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

Change-Id: Iba3f313ee895a4788aa46a01d9f4785b7e3a12c4