[automerger skipped] Merge "Disable auto time zone on non-telephony devices" into rvc-dev am: 13805decc7 am: d605c8edac -s ours am: c10b33350a -s ours am: fd65d21244 -s ours
am skip reason: Change-Id Iea9c9e04c5617ccf0ba20511344884d3d88f2a9b with SHA-1 5d50bfe4b3 is in history

Change-Id: Id24fbc67b8c1588a4e8978aac7d53578de27dfe8