[automerger skipped] Skip ab/6749736 in stage. am: d57626304f -s ours

am skip reason: Change-Id I122d1acaca1d3895d02d18f2221a3af636476d65 with SHA-1 16c2d8bfc7 is in history

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

Change-Id: I2b81c0438b84b4df8f04194aa9ef8e3119bc023e