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

Change-Id: I6288ecddda6a9a6c64badbcf8958ecbfe6aa77e5