[automerger skipped] Merge "AudioService: setDeviceVolume shouln't change the...

[automerger skipped] Merge "AudioService: setDeviceVolume shouln't change the mute state" into tm-qpr-dev am: d2fe4b9e am: f617b02a -s ours

am skip reason: Merged-In I4da94d75a1396fc6d1486a0955fb537b7638e9d6 with SHA-1 26f6c77c is already in history

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



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