q_tzdata_aml_294400310
Merge cherrypicks of [16059907] into qt-aml-tzdata-release.

Change-Id: I0b454b4ce9c0fe8dc15fbc2928a38e94ec4fed2a