tree 853fe3f9e7ab71dfdaa0d351a2ebdc82793f1211
parent c28cb5ede645a0bdbadd8b80456a02591d65d844
parent b271c6d36c7dd08f46590c4f55caf90e27eece2d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1660769149 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1660769149 +0000

Merge cherrypicks of [19656115, 19658839] into qt-aml-tzdata-release.

Change-Id: Ibbb47c331d9cef70478fa81a183d4d5dcfd24c5d