Bug 847342 - keep the timezone user selected manually
Bug 847342 - To reset the time zone to the user selected value after the
time auto update is disabled.
Merge pull request #9138 from RudyLu/settings/keep_user-selected_timezone

Bug 847342 - keep the timezone user selected manually, r=@evelynhung, a=tef+