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

Change-Id: I92c21317355778ad42f0b5da558e6b8f9a6102a4