Android Mainline 12.0.0 Release 55 (7929774,com.google.android.tzdata2)
[automerger skipped] Import translations. DO NOT MERGE am: dba170b33f -s ours am: e567bc7d8f -s ours
am skip reason: subject contains skip directive

Change-Id: I99bdbedf071a20992f0f1f4197bfbd562d1f1334