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

Change-Id: Id8e8ca5c161679db50445ff1649bd6f9642fdef2