Mark ab/6881855 as merged am: ea446020ae am: a8c9556a58

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/13113083

Change-Id: I693bd524b5d648a771b42ed61d770ed204e97edc