[automerger skipped] Merge RQ2A.210305.007 am: b53ec8e886 -s ours am: 1e5810f07a -s ours am: 5c39767efb -s ours

am skip reason: Change-Id I2532eb50d94d626eddd1ce7eb6b1cfa6c2d6ebfe with SHA-1 0c55ff2a10 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneUpdater/+/1613638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice0b93f0052bd19044dbe3952f9d625e22b733d7
tree: 16b13060335e22ac3e8fc103fcfb15aece0ab0aa
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS