fix import error for orgpolicy (#8291) (#15132)

Signed-off-by: Modular Magician <[email protected]>
Co-authored-by: Edward Sun <[email protected]>

Author: modular-magician

.changelog/8291.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+org policy: fixed forcing recreation on imported state for `google_org_policy_policy`
+```

google/tpgdclresource/orgpolicy_utils.go

@@ -26,6 +26,11 @@ func ResourceOrgPolicyPolicyCustomImport(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return fmt.Errorf("Error constructing id: %s", err)
 	}
+
+	// reset name to match the one from resourceOrgPolicyPolicyRead
+	if err := d.Set("name", id); err != nil {
+		return fmt.Errorf("Error setting name: %s", err)
+	}
 	d.SetId(id)
 
 	return nil