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

Change-Id: I3e16fc67c83eeb711d795d0b5a72fde0525ee39d