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

* commit '5ef72c30847a0b29c35489fef30bc21fe5a5dcfe':
  telephony: Add same named operator configuration for some operators