[automerger skipped] DO NOT MERGE Update Android tzdata from 2018e to 2018f
am: f1d42b78cb  -s ours

Change-Id: Icebb9646c9f57e1aa890e93a7ff6e41fa2768ece