multiple city stop kix-pek-pvg-lhr

Hi,
I'm a British passport holder - I have a flight from Osaka to London via Beijing and Shanghai. It's all less than 24 hrs, but itll obviously be a domestic flight (PEK to SHA)
It's all booked as one trip with air china - can I still get the 24hr visa free transit, even though there's a domestic leg? I'm assuming my bag is checked through to London xD