[automerger skipped] Skip rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 4560685c35 -s ours am: ced508c832 -s ours

am skip reason: Change-Id I4d89384e9fd6f470c7500defe007d098ab116ae8 with SHA-1 3b45297e71 is in history

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

Change-Id: If77e05129b42b0e8cfcca35ffcb2bf446cbf8aae