KeyMint: make tags keymint-enforced am: 82fe2598fe am: 40ed926d1d

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

Change-Id: I72205dfa958e179683866d5285ccc4586abe0731