[automerger skipped] Merge "Fixing comparison types." am: 9f60a302c3 am: 7b786e4b47 -s ours am: a042397bef -s ours

am skip reason: Merged-In Ib4fb75357e16d142824f292e3c31207f77805807 with SHA-1 7cccfb4ce0 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1731929

Change-Id: I9cd3cc08e398fbf8458e52ab0bf09e0936d45869