Merge "Add KM_TAG_USER_SECURE_ID."