Merge "[automerger skipped] Merge "Disable auto time zone on non-telephony devices" into rvc-dev am: 13805decc7 -s ours am: 20a72487ad -s ours am skip reason: Change-Id Iea9c9e04c5617ccf0ba20511344884d3d88f2a9b with SHA-1 2c6c3c3daf is in history" into rvc-d1-dev-plus-aosp am: 6b58dc9c74 -s ours
am skip reason: Change-Id Iea9c9e04c5617ccf0ba20511344884d3d88f2a9b with SHA-1 2c6c3c3daf is in history

Change-Id: I9af4695fcd6ec1bf2dd1ae6fdd581995a8d55d8e