Merge "Disable auto time zone on non-telephony devices" am: 2edc5306da

Change-Id: I09afa6bd32b533dc43aab15b9eb77e4335d3c498