Merge "telephony service support notification channel" into oc-dev am: 9b5ec840c9
am: c7466d9e57

Change-Id: Icaddcd2a47cc3e3619b02f98239d020c7bab6d57