Merge changes Iaa941e12,Icbd4c9cd

* changes:
  KeyMint HAL: reinstate tags in extension schema
  KeyMint HAL: clarify obsolete tags