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

Change-Id: I1c1eba33982cb816378490dce8db884526e54b03