[automerger skipped] DO NOT MERGE: Update Android tzdata from 2018g to 2018i. am: 506ecc2759 -s ours
am: 02928296fb -s ours
am skip reason: subject contains skip directive

Change-Id: Id66aed43dba978ac19b1ba35616410848d16df5a