am 230e20d2: am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev

* commit '230e20d26815ecc1aea1a4709cd7e188d049360f':
  telephony: Add same named operator configuration for some operators