[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 9c28d5e5f6 am: 6f3ccca004 -s ours am: 72dad72417 -s ours

am skip reason: Change-Id Ica89dc1c112fdb6d26ee59355ed06ce32c6e7d40 with SHA-1 a46dbb0270 is in history

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

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