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

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

Change-Id: I7ff941e96d9c6aa9931071112153acc41d90c61d