Merge "AS: use dock device for volume when dock device is selected." into...

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

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



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