KeyMint: make tags keymint-enforced am: 3f3dabc647

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

Change-Id: I31fb150333dfea89d8e2231be525b123cd89f806