Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b

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



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