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

Change-Id: I19fa5a538e634b195aa96975b63c5a5044f92082