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

am skip reason: subject contains skip directive

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

Change-Id: I5872bb3c7a3b902737283444e725f9893e015985