Merge "Rename the legacy notification channel" into oc-dev am: 0c34dc60c4
am: 45ba2ef24e

Change-Id: I9d6e61348602f8002889c4a39ff02354d2a99dfc