[automerger skipped] DO NOT MERGE -  Mark RQ2A.210105.001 as merged. am: 2d757f6fdd -s ours am: 2308915dfa -s ours

am skip reason: Merged-In Ie0334fddf5ad08b1c90e2d5c41ac48f325e1ab7e with SHA-1 d66162ac0a is already in history

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

Change-Id: I25b7c34bec78f7656962ed630dbe07b004d47a02