[automerger skipped] Merge ab/7061308 into stage. am: 58fcef52d2 -s ours am: e9982a9e86 -s ours

am skip reason: Change-Id Ic0b8d84bd1d484488e288410eb0acb40785adaf9 with SHA-1 f2af9b2a17 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/13658605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide0a45e0201be9667e2386c35d150c1f6efecf43