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

Change-Id: I97eafae4f9ee8a954015482cbd8efacb0781c65e