Merge "Add support for KM_TAG_USER_SECURE_ID."