am 92469ed0: am f1babb18: Merge "Add KM_TAG_USER_SECURE_ID."

* commit '92469ed087f6e3c0b13ad0562661236731358029':
  Add KM_TAG_USER_SECURE_ID.