[automerger skipped] Merge "Move time zone detection logic to system server"...
[automerger skipped] Merge "Move time zone detection logic to system server" am: 4a2167e6 am: ad41d9d9 -s ours
am skip reason: Change-Id I2c301e53cda63f670c20d3b5e361dcf2318537d3 with SHA-1 fc1d073b is in history
Change-Id: I60fbf32576ef94cbcb38b357b9a9a972b4491013