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

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

Change-Id: I94c63fc32b9f7e652434e42bf0f4778611a7c563