[automerger skipped] Merge QQ3A.200605.002 into master am: 3472311082 -s ours

am skip reason: Change-Id Ica1e1d90f13d4195ec2eb62ed2255f5b741e048c with SHA-1 fe695d4001 is in history

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

Change-Id: I1d29e3b002901f1fba398b0972f55656bd1fb001