Merge "support notification channel for defaultcarrier app" into oc-dev