Merge "Fixing comparison types." into sc-dev am: 7bd90714b6

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

Change-Id: I409250291e5f1562f9ef9d8e0dec5123893b07ba