fix(pm): os-regen-merge.sh partitions step-1 conflicts by generatedness — a NOT_DRIVER_MANAGED path is resolved by regeneration, not by hand (#18047)

fix(pm): os-regen-merge.sh partitions step-1 conflicts by generatedness — a NOT_DRIVER_MANAGED path is resolved by regeneration, not by hand (#18047) #24868