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