twice in china, one month apart

We will be traveling from Los Angeles, USA to Shanghai, arriving on 2/15/20; we do have a 4 hr layover in Xi'an but will not leave the terminal. We plan to visit the city only and leave 2/17/20 for Manila. We will also visit a few other countries. We will then travel from Bangkok back to Shanghai on 3/13/20. We have a return flight from Shanghai to Los Angeles on 3/15/20 with a 7 hr layover in Chengdu and will not leave the terminal. Will we qualify for the 144 hr visa free transit both times we are in Shanghai?