Merge "Fix handleSetVolume command" am: d1265b9a62 am: 8bac397066

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2471062

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