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

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



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