Merge "AudioService: fix volume group setting name" into tm-qpr-dev am: 74e8c779 am: 0d25cc19

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



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