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

Change-Id: I010a1ceb8f5f25071fead7d9d8b37ea708446c60