Merge "Update current device when volume control id changes" into udc-dev am:...

Merge "Update current device when volume control id changes" into udc-dev am: 2f63277b am: 6fd8e4d5

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



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