am 3113e2e0: b/3045098 Makes settings always display a tz. Do not merge

Merge commit '3113e2e0187907e84c1ab3759f5e90d0e83ad1f3' into gingerbread-plus-aosp

* commit '3113e2e0187907e84c1ab3759f5e90d0e83ad1f3':
  b/3045098 Makes settings always display a tz. Do not merge