[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3843c34a3a -s ours

am skip reason: Merged-In I2ea4cbc8e8e3e94447960e64cc6d39b44df474ff with SHA-1 450973a248 is already in history

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

Change-Id: If298ef8c098d15287a384d5882d754d8e67f2c8d
tree: 163920c8e35f050784eb2dca9cebe0c9983c5ebb
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties