Merge "Move time zone detection logic to system server"