[automerger skipped] Test for contract between AndroidKeyStoreKey hash and equals. am: 486adb9aa8 -s ours am: 4554566725 -s ours
am skip reason: Merged-In Ic6e60752faa986debe3d325f54242cffaa03b336 with SHA-1 5fe5f2def0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306879
Change-Id: Iea6fb350c2ac7e20529ca4780c5df914a3884ac1
This commit is contained in: