Merge "Disable auto time zone on non-telephony devices"