Merge "Also use the notification's sound for the misc channel" into oc-dev
am: ed8f49efdc

Change-Id: I268e2702a6fbe714276f38581493ef2a089007e8