Merge "AS: use dock device for volume when dock device is selected." into udc-dev am: 4e942f08

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



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