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

Merge "APM: use dock device for volume when dock device is selected." into udc-dev am: 820d3a39 am: 1ad62f42

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



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