Merge changes from topic "telephony_aosp_cp"

* changes:
  Fix tests after mid-air collision
  Remove phone type-specific time detection logic
  Remove throttling difference for GSM
  Add more tests around time / time zone detection