Merge "rename notification channel" into oc-mr1-dev
am: 05ff7464a8

Change-Id: I85723a128bd9fadbb20ed38e13d8304ed01fcef8