Merge "Muting ring volume slider disables notification" into tm-qpr-dev am: 40a293fb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21164988



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