[automerger skipped] Merge Android R am: 4dbc1203a9 -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: Ica64db3e71435e2f33cf87229202e946c3bd49e1