Merge "Stop sound when bubble notification is suppressed" into tm-qpr-dev am: f676e7d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19585947



Change-Id: I668731ebe93b7d687acd466ffde1fad004679e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>