Merge "Allow notification channels to be silent." into oc-dev
am: d178ec489f

Change-Id: I9e016e2523b9da200c26df2ddce642942bc0b806