Android Mainline 12.0.0 Release 56 (7920574,com.google.android.tzdata3)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 6bdf99a786 -s ours am: 2912e813a2 -s ours am: 4b4f160585 -s ours

am skip reason: Change-Id I727dffd0234e766cbc528ddc78e4c99d2b2afcbf with SHA-1 4e713ba768 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I386dfea9044e985f2aa244527769bd78a0cb8292