Merge "Copy KeyStore.UID_SELF to KeyProperties.UID_SELF" into main