Unlikely to happen. It's one of the few places that phones can differentiate themselves so manufacturers are unlikely to want to lose that option to tinker with.
Given it's a clear safety issue they shouldn't be able to differentiate on that anymore than on the arsenic content in breakfast cereals.
I don't think you can claim that non-replaceable batteries are a clear safety issue, especially when the replacement market would be flooded with cheap junk hand grenades.