Merge "Disable auto time zone on non-telephony devices" into rvc-dev am: 13805decc7 am: d605c8edac

Change-Id: Ic9274f87409a904535474f7e5a25d36505a8b69c