[automerger skipped] Track CLDR-13029 / 2019b changes am: e01364c510 -s ours am: 309fab32b2 -s ours am: 604dc34f2f -s ours

am skip reason: Change-Id Id82b58f1029e588908eb7601f1893138b9abf183 with SHA-1 3d89d902ac is in history

Change-Id: Ia4224276dc7694db757d83023d1edc3ee0cf4028