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

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



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