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

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



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