am 9d5ac7bd: am dcbba67a: Telephony: Fix merge issue "Set enabled state before...
am 9d5ac7bd: am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."
* commit '9d5ac7bd':
Telephony: Fix merge issue "Set enabled state before notification is sent out."