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

Change-Id: Ie1d34910cdbd1d534296dd848baa3af8b181357a