[automerger skipped] Merge Android U (ab/10368041) am: 908e2076e1 -s ours am: 57d3d21ada -s ours am: 091ee19da0 -s ours

am skip reason: Merged-In If34ae79eae40c651b9d55efbc88fd68213e7c675 with SHA-1 efc324edd9 is already in history

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

Change-Id: I2a07f70c20967ad0ce38e30c9988f42f09c42b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>