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: c434411b

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



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