Merge changes from topic "keymint_utils" am: f747e92a52

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

Change-Id: I9400b873fd72db27081e2a74e681ee9a078fbc34