Merge "Disable auto time zone on non-telephony devices" into rvc-dev am: 13805dec am: d605c8ed am: dab25d68 Change-Id: I6b53f4d9ae477a903f36198005d163e8f6562743