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

Change-Id: I787c67c5538f2181d21a756fb0493edea8bd32d0