Merge "AudioService: fix volume group setting name" into tm-qpr-dev am: 74e8c77963 am: 0d25cc1951 am: a067b1c0ee

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

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