Merge changes from topic "keymint_utils" am: f747e92a52 am: 1da6571bff

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

Change-Id: Iffffe1d6efdd6c12d8894f326edefa024fc82446