Merge "Merge "Disable auto time zone on non-telephony devices" am: 2edc5306...
Merge "Merge "Disable auto time zone on non-telephony devices" am: 2edc5306 am: d14160c6 am: 7c93c7bf am: 081b3cf9" into rvc-qpr-dev-plus-aosp am: 9a2dc953
Change-Id: I740980625a38649a1b94c82ab2ba32b75d4a2926