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

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

Change-Id: Ie3eed71fc63d71cd34211794ece2797dc77f0607