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

Change-Id: I7044177aa99426810c23e2100633d3f2c85d5c8e