[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 42d783af3d -s ours am: 123c6f2b88 -s ours am: bbbaabc716 -s ours am: b800246789 -s ours

am skip reason: Merged-In Id546c541980bcb3fc14e3847f7dcc684687af7e1 with SHA-1 8a7cf265b6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/17545172

Change-Id: I09890ba3aa24a1ee026bc4296d7ca2b78638b46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 1664b2924e4da9b8c639ec84eab20bc68569e38e
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties