Merge "AudioService: Fix volume control during ringtone" into main am: 7696104c13 am: 05a80f2111

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

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