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

Change-Id: I5e01ab76d08b3075335b9b72e4879398d86d4b0e