Bug 894338 - [Common] mismatch city name of Sao Paulo between tz.json an...

...d apn_tz.json