[automerger skipped] Merge "Disable auto time zone on non-telephony devices"...
[automerger skipped] Merge "Disable auto time zone on non-telephony devices" into rvc-dev am: 13805dec am: d605c8ed -s ours am: c10b3335 -s ours
am skip reason: Change-Id Iea9c9e04c5617ccf0ba20511344884d3d88f2a9b with SHA-1 5d50bfe4 is in history
Change-Id: I6aeca06548745c7e00c7ec4915df046c173be3f9