am f1babb18: Merge "Add KM_TAG_USER_SECURE_ID."

* commit 'f1babb18ae11e4870ae58ccdd339e5b643b1f69e':
  Add KM_TAG_USER_SECURE_ID.