Merge changes from topic "telephony_aosp_cp"

* changes:
  Make state transitions clearer in NitzStateMachine
  Move time zone lookup logic