Merge "AudioService: fix volume behavior for dock devices" into tm-qpr-dev am: 67f8ff06

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



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