Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am: 9b9e823096 am: 7dc29d076f am: 18eb3b4ff1
am: 2b923c07a7

Change-Id: I7c1abcb43f062a4055b2f65a19b32d18fe5211cb