Merge "Implement a separate controller for ring volume" into tm-qpr-dev am:...

Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f am: 4fc098dc

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



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