Merge "Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF" into main