Merge "Don't tear down notification channels." into oc-dev am: 3799fb5085
am: a86eb7e9ff

Change-Id: Icf9ea47f924bf21df3a4f5afa54d16ea95369c8b