Cherry-pick: cldr-ticket 11507: Update Android CLDR tzdata from 2018e to 2018f am: a71b248034
am: e415e10fce

Change-Id: Iaf3e2c2eb2f502e05c5f9442a77640132981e6fc