[automerger skipped] Merge Android R am: 4dbc1203a9 -s ours am: 4ea7426a1b -s ours am: f901b2a776 -s ours

am skip reason: Change-Id I3c6248f1992b2d2eb1df18f1af5f75a68f8dbc16 with SHA-1 555a4df687 is in history

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

Change-Id: I000f44252efab2410c0290bd8313f0fe6a36e106