[automerger skipped] Merge RQ2A.210305.007 am: ae27ffe313 -s ours

am skip reason: Change-Id Ia05ad76f4602ee1084d1d85053663dd682a1a33e with SHA-1 58fcef52d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I993a231b5d379a60dfd6c8408d13e5a2cfbc66ed