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

Change-Id: Id90d02a05413812df90a3691f1f4b8a99e74669b