Merge "Remove code using mTransitions because we shouldn\'t rely on ZoneInfo impl"
am: 1029ef11c8

* commit '1029ef11c82773c1704e3add75ecd9cb564474de':
  Remove code using mTransitions because we shouldn't rely on ZoneInfo impl