Merge "Fixing comparison types." am: 9f60a302c3

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

Change-Id: Iefe08d0ba40d5918bb586a1346cc13588b6ec8b5